cocopp 2.9.2__tar.gz → 2.9.3__tar.gz

{cocopp-2.9.2 → cocopp-2.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocopp
-Version: 2.9.2
+Version: 2.9.3
 Summary: Benchmarking framework for all types of black-box optimization algorithms, postprocessing.
 Author: Umut Batu, Dimo Brockhoff, Paul Dufossé, Tobias Glasmachers, Nikolaus Hansen, Filip Matzner, Olaf Mersmann, Raymond Ros, Dejan Tušar
 License: BSD-3-Clause

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.9.2'
-__version_tuple__ = version_tuple = (2, 9, 2)
+__version__ = version = '2.9.3'
+__version_tuple__ = version_tuple = (2, 9, 3)
 
-__commit_id__ = commit_id = 'ga918f9fe5'
+__commit_id__ = commit_id = 'g55711ae14'

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/cococommands.py

@@ -57,19 +57,17 @@ Examples:
 
 """
 
-from __future__ import absolute_import
-
 import collections as _collections
 import warnings as _warnings
+
 import numpy as np
 
-from .pproc import get_DataSetList as _DataSetList
-from .toolsdivers import StringList as _StringList
-from .archiving import official_archives
 from . import config as _config
-from . import pproc as _pproc
 from . import genericsettings as _genericsettings
+from . import pproc as _pproc
 from . import testbedsettings as _testbedsettings
+from . import toolsdivers as _td
+from .archiving import official_archives
 
 
 def true_number_of_trials(ds):
@@ -235,7 +233,7 @@ def load(filename):
     the returned data set list may not work anymore when used with plotting
     functions of the `cocopp` module, see also `load2`.
     """
-    return _DataSetList(official_archives.all.get_extended(_StringList(filename)))
+    return _pproc.get_DataSetList(official_archives.all.get_extended(_td.StringList(filename)))
 
 
 def load2(args, keep=None, remove=None, flat_list=None):

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/compall/pprldmany.py

@@ -1039,6 +1039,7 @@ def main(
     num_of_instances_functions = []
     num_of_instance_numbers = []
     for alg in algorithms_with_data:
+        i0 = len(num_of_instances)
         try:
             # DONE (fix #49): we need all functions of alg
             for _f, dictAlgperFunc in sorted(dictFunc.items()):
@@ -1047,14 +1048,25 @@ def main(
                 num_of_instance_numbers.append(len(set(dictAlgperFunc[alg][0].instancenumbers)))
         except IndexError:
             pass
-    min_num = max((1/1.1, min(num_of_instance_numbers)))  # should never be < 1
-    # issue a warning if number of instances is inconsistent
-    # number of instances (repetitions) are rarely the same with the ExperimentRepeater
-    if len(set(num_of_instances)) > 1 and any(
-            (n / min_num) % 1 for n in num_of_instances
-            ) and genericsettings.warning_level >= 1:
-        warnings.warn("Number of instances was not a multiple of %s for all algorithms:"
-                      " %s instances found." % (str(min_num), str(num_of_instances)))
+        else:
+            # taking the opportunity to make a consistency check for the
+            # number of instances, this should ideally go elsewhere like
+            # at the end of get_DataSetList or DataSet (which may miss pickle data)
+            if genericsettings.warning_level >= 1 and (
+                    genericsettings.count_instance_consistency_checks < len(algorithms_with_data)):
+                genericsettings.count_instance_consistency_checks += 1
+                # check that the very same instances are used in all DataSets of a single algorithm
+                if len(set(num_of_instance_numbers[i0:])) > 1:
+                    warnings.warn(f"Different set of instances = {set(num_of_instance_numbers[i0:])}"
+                                  f"\n  found for algorithm {alg}.\n"
+                                  "Generally, all functions should be run on the same set of instances.")
+                # check that all instances are repeated the same number of times by DataSet
+                min_num = max((1/1.1, min(num_of_instance_numbers[i0:])))  # should never be < 1
+                if len(set(num_of_instances[i0:])) > 1 and any(
+                        (n / min_num) % 1 for n in num_of_instances[i0:]):
+                    warnings.warn("The number of instances of algorithm %s was not a "
+                                  "multiple of %s: %s instances found." % (
+                                  alg, str(min_num), str(num_of_instances[i0:])))
     # display each number of instances once, i.e. remove copies
     # and now also the respective lowest/first function number
     # (somewhat adapted to higher number of instance repetitions)

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/genericsettings.py

@@ -320,3 +320,6 @@ isLogLoss = True  # only affects rungeneric1
 isPickled = False  # only affects rungeneric1
 ##
 isScatter = True  # only affects rungenericmany
+
+count_instance_consistency_checks = 0
+"""counter of checks done in `pprldmany`, avoids repeated checks and warning floods"""

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/pproc.py

@@ -340,7 +340,7 @@ class RunlengthBasedTargetValues(TargetValues):
 
         TODO: check use case where ``reference_data`` is a dictionary similar
         to ``bestalg.bestAlgorithmEntries`` with each key dim_fun a reference
-        DataSet, computed by bestalg module or portfolio module.
+        DataSet, computed by bestalg module or portfolio module::
 
             dsList, sortedAlgs, dictAlg = pproc.processInputArgs(args)
             ref_data = refalg.generate(dictAlg)
@@ -2961,6 +2961,7 @@ def get_DataSetList(*args, **kwargs):
     executed.
     """
     extension = ".pickle"
+    genericsettings.count_instance_consistency_checks = 0  # reset for new data sets
 
     def fallback():
         return DataSetList(*args, **kwargs)
@@ -3085,10 +3086,12 @@ class DataSetList(list):
             alg_names.extend((len(fnames) - len(alg_names)) * [name])
         assert len(fnames) == len(alg_names)
         for name, alg_name in zip(fnames, alg_names):
+            # alg_names = main input arg full path from above args
             if isinstance(name, DataSet):
                 self.append(name)
                 # we could check here whether name.algId and alg_name are similar or consistent
             elif name.endswith(".info"):
+                # name = .info file full path
                 self.processIndexFile(name, alg_name)
             elif name.endswith(".pickle") or name.endswith(".pickle.gz"):
                 if _using_recommendations:
@@ -4240,7 +4243,7 @@ def process_arguments(args, current_hash, dictAlg, dsList, sortedAlgs):
     Output `dictAlg` is the `dsList` reorganized by algorithm name.
     """
     for ialg, alg in enumerate(args):
-        alg = alg.strip().rstrip(os.path.sep)  # lstrip would not be the same folder anymore
+        alg = alg.strip().rstrip(os.path.sep).rstrip('/').strip()  # lstrip(sep) would not be the same folder anymore
         if alg == "":  # might cure an lf+cr problem when using cywin under Windows
             continue
         if findfiles.is_recognized_repository_filetype(alg):
@@ -4257,7 +4260,7 @@ def process_arguments(args, current_hash, dictAlg, dsList, sortedAlgs):
                 ds._data_folder = alg
                 # to restore name information:
                 # ds.algId = toolsdivers.str_to_latex(toolsdivers.strip_pathname1(alg))
-            # Nota: findfiles will find all info AND pickle files in folder alg.
+            # Note: findfiles will find all info AND pickle files in folder alg.
             # No problem should arise if the info and pickle files have
             # redundant information. Only, the process could be more efficient
             # if pickle files were in a whole other location.

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp/toolsdivers.py

@@ -364,7 +364,12 @@ def strip_pathname1(name):
     from input string ``name``, replace any remaining path separator
     with '/', and keep only the last part of the path"""
     return (
-        (name.replace(".." + os.sep, "").replace("." + os.sep, "").strip().strip(os.sep).split(os.sep)[-1])
+        (name
+         .replace(".." + os.sep, "")
+         .replace("." + os.sep, "")
+         .strip()
+         .strip(os.sep)
+         .split(os.sep)[-1])
         .replace("data", "")
         .replace("Data", "")
         .replace("DATA", "")

{cocopp-2.9.2 → cocopp-2.9.3}/src/cocopp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocopp
-Version: 2.9.2
+Version: 2.9.3
 Summary: Benchmarking framework for all types of black-box optimization algorithms, postprocessing.
 Author: Umut Batu, Dimo Brockhoff, Paul Dufossé, Tobias Glasmachers, Nikolaus Hansen, Filip Matzner, Olaf Mersmann, Raymond Ros, Dejan Tušar
 License: BSD-3-Clause

cocopp-2.9.3/src/cocopp.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.9.3",
+  "distance": 0,
+  "node": "g55711ae1425ec11cf257283f7e3d1592a2a014be",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-11-13"
+}

cocopp-2.9.2/src/cocopp.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.9.2",
-  "distance": 0,
-  "node": "ga918f9fe554e3f31444148ccd2d7f2355245194f",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-11-11"
-}