Merge pull request #1889 from brockho/development

improved focus dimension for some suites
numbbo · Apr 30, 2019 · 4115569 · 4115569
2 parents bedac01 + 0ad91d8
commit 4115569
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/code-postprocessing/cocopp/ppfig.py b/code-postprocessing/cocopp/ppfig.py
@@ -266,15 +266,15 @@ def get_rld_link(current_dir):
 
     file_name = '%s.html' % genericsettings.pprldmany_file_name
     links += add_link(current_dir, folder, file_name,
-                      pprldmany_per_func_dim_header, dimension=20)
+                      pprldmany_per_func_dim_header, dimension=testbedsettings.current_testbed.goto_dimension)
 
     file_name = '%s.html' % genericsettings.pprldmany_group_file_name
     links += add_link(current_dir, folder, file_name,
-                      pprldmany_per_group_dim_header, dimension=20)
+                      pprldmany_per_group_dim_header, dimension=testbedsettings.current_testbed.goto_dimension)
 
     file_name = '%s.html' % genericsettings.pprldmany_file_name
     links += add_link(current_dir, '', file_name,
-                      pprldmany_per_group_dim_header, dimension=20)
+                      pprldmany_per_group_dim_header, dimension=testbedsettings.current_testbed.goto_dimension)
 
     return links
 

diff --git a/code-postprocessing/cocopp/testbedsettings.py b/code-postprocessing/cocopp/testbedsettings.py
@@ -227,6 +227,7 @@ class GECCOBBOBTestbed(Testbed):
         name=testbed_name_single,
         short_names=get_short_names(shortinfo_filename),
         dimensions_to_display=(2, 3, 5, 10, 20, 40),
+        goto_dimension=20,  # auto-focus on this dimension in html
         rldDimsOfInterest=dimsOfInterest,
         tabDimsOfInterest=dimsOfInterest,
         hardesttargetlatex='10^{-8}',  # used for ppfigs, pptable and pptables
@@ -402,6 +403,7 @@ class GECCOBiObjBBOBTestbed(Testbed):
         name=testbed_name_bi,
         short_names=get_short_names(shortinfo_filename),
         dimensions_to_display=(2, 3, 5, 10, 20, 40),
+        goto_dimension=20,  # auto-focus on this dimension in html
         rldDimsOfInterest=dimsOfInterest,
         tabDimsOfInterest=dimsOfInterest,
         hardesttargetlatex='10^{-5}',  # used for ppfigs, pptable and pptables
@@ -541,6 +543,7 @@ class BBOBLargeScaleTestbed(GECCOBBOBTestbed):
         name=testbed_name_ls,
         short_names=get_short_names(shortinfo_filename),
         dimensions_to_display=(20, 40, 80, 160, 320, 640),
+        goto_dimension=160,  # auto-focus on this dimension in html
         tabDimsOfInterest=dimsOfInterest,
         rldDimsOfInterest=dimsOfInterest,
         hardesttargetlatex='10^{-8}',  # used for ppfigs, pptable and pptables
@@ -600,6 +603,7 @@ class GECCOBBOBMixintTestbed(GECCOBBOBTestbed):
         name=testbed_name_mixint,
         first_dimension=5,
         dimensions_to_display=[5, 10, 20, 40, 80, 160],
+        goto_dimension=40,  # auto-focus on this dimension in html
         tabDimsOfInterest=dimsOfInterest,
         rldDimsOfInterest=dimsOfInterest,
         reference_algorithm_filename=None,  # TODO produce correct reference algo and update this line
@@ -628,6 +632,7 @@ class GECCOBBOBBiObjMixintTestbed(GECCOBiObjExtBBOBTestbed):
         name=testbed_name_bi_mixint,
         first_dimension=5,
         dimensions_to_display=[5, 10, 20, 40, 80, 160],
+        goto_dimension=40,  # auto-focus on this dimension in html
         instances_are_uniform=False,
         tabDimsOfInterest=dimsOfInterest,
         rldDimsOfInterest=dimsOfInterest,