fix #2097 xlimit bug introduced with commit f5289e3

code-postprocessing/cocopp/compall/pprldmany.py

@@ -46,6 +46,7 @@
 PlotType = ppfig.enum('ALG', 'DIM', 'FUNC')
 
 displaybest = True
+x_limit = genericsettings.xlimit_pprldmany
 divide_by_dimension = True
 annotation_line_end_relative = 1.065  # lines between graph and annotation, was 1.11, see also subplots_adjust
 annotation_space_end_relative = 1.21  # figure space end relative to x_limit, space is however determined rather by subplots_adjust(...) below!?
@@ -211,8 +212,6 @@ def plotdata(data, maxval=None, maxevals=None, CrE=0., **kwargs):
     :param kwargs: optional arguments provided to plot function.
     
     """
-    x_limit = genericsettings.xlimit_pprldmany
-
     # Expect data to be a ndarray.
     x = data[np.isnan(data) == False]  # Take away the nans
     nn = len(x)
@@ -597,7 +596,6 @@ def main(dictAlg, order=None, outputdir='.', info='default',
 
     """
     global divide_by_dimension  # not fully implemented/tested yet
-    x_limit = genericsettings.xlimit_pprldmany
 
     tmp = pp.dictAlgByDim(dictAlg)
     algorithms_with_data = [a for a in dictAlg.keys() if dictAlg[a] != []]

code-postprocessing/cocopp/config.py

@@ -145,8 +145,8 @@ def config(suite_name=None):
         ppscatter.markersize = 16
 
     else:
-        pass  # here the default values of the modules apply
-        # pprlmany.x_limit = ...should depend on noisy/noiseless
+        # here the default values of the modules apply
+        pprldmany.x_limit = settings.xlimit_pprldmany  # ...should depend on noisy/noiseless
     if 11 < 3:  # for testing purpose
         if tbs.current_testbed:
             # TODO: this case needs to be tested yet: the current problem is that no noisy data are in this folder

code-postprocessing/cocopp/genericsettings.py

@@ -45,8 +45,15 @@
 single_runlength_factors = [0.5, 1.2, 3, 10] + [10 ** i for i in range(2, 12)] # used in pprldistr
 
 xlimit_pprldmany = 1e7
-"""maximal run length multiplier used in `pprldmany`, noisy: rather 1e8
-   maybe better: ``10 * genericsettings.evaluation_setting[1]``?"""
+"""maximal run length multiplier used in `pprldmany`.
+
+   After a manual change like ``cocopp.genericsettings.xlimit_pprldmany =
+   1e5``, ``cocopp.config.config()`` needs to be called to "activate" the change.
+   Alternatively, we could also directly set
+   ``cocopp.compall.pprldmany.x_limit = 1e5``.
+
+   Noisy setting should be rather 1e8?
+   ?maybe better: ``10 * genericsettings.evaluation_setting[1]``?"""
 xlimit_expensive = 1e3
 """maximal run length multiplier in expensive setting, used in config for
    `pprldmany` and `ppfigdim`"""