coco-experiment 2.8.1__tar.gz → 2.8.3__tar.gz

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/.gitignore

@@ -64,3 +64,5 @@ test/regression-test/bbob_noisy_regression_test/data_legacy/*.json
 test/regression-test/bbob_noisy_regression_test/results
 build/c/.vscode
 bare_problem.c
+test/regression-test/create/exdata
+test/regression-test/exdata

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: coco-experiment
-Version: 2.8.1
+Version: 2.8.3
 Summary: Benchmarking framework for all types of black-box optimization algorithms.
 Project-URL: Homepage, https://github.com/numbbo/coco-experiment
 Project-URL: Documentation, https://numbbo.github.io/coco-doc/apidocs/cocoex/
@@ -11,14 +11,13 @@ License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.8
-Requires-Dist: numpy>=1.24.0
+Requires-Python: >=3.12
+Requires-Dist: numpy>=1.26.0
 Description-Content-Type: text/markdown
 
 <h1 align="center">

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["meson-python", "Cython >= 3.0.6", "wheel", "numpy"]
+requires = ["meson-python >= 0.22", "Cython >= 3.3", "wheel", "numpy >= 2.5"]
 build-backend = 'mesonpy'
 
 [project]
@@ -22,20 +22,21 @@ authors = [
 ]
 description = 'Benchmarking framework for all types of black-box optimization algorithms.'
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12"
 license = { text = "BSD-3-Clause" }
 classifiers = [
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: BSD License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
     "Programming Language :: Python :: Implementation :: CPython",
 ]
-dependencies = ["numpy >= 1.24.0"]
+dependencies = [
+    "numpy >= 1.26.0",
+]
 dynamic = ["version"]
 
 [project.urls]
@@ -48,7 +49,7 @@ where = ["src"]
 
 [tool.pytest]
 log_cli = true
-addopts = "--doctest-modules"
+addopts = ["--doctest-modules"]
 
 [tool.cibuildwheel]
 build-frontend = "build"
@@ -71,3 +72,8 @@ include = [
 
 [tool.hatch.version]
 path = "src/cocoex/_version.py"
+
+[dependency-groups]
+dev = [
+    "build>=1.6",
+]

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/__init__.py

@@ -19,6 +19,7 @@ from . import noiser # noqa: F401
 from . import solvers # noqa: F401
 from . import utilities # noqa: F401
 from . import exceptions # noqa: F401
+# from . import test # noqa: F401  # gives a circular import, why???
 from .interface import Observer as _Observer
 from .interface import Problem as _Problem
 from .interface import Suite as _Suite 

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/_version.py

@@ -1,7 +1,7 @@
 # file generated by fabricate
 # Do not change, do not track in version control!
 
-__version__ = "2.8.1"
+__version__ = "2.8.3"
 version = __version__
 
 if __name__ == "__main__":

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/coco.c

@@ -25922,6 +25922,18 @@ void coco_suite_decode_problem_index(const coco_suite_t *suite, const size_t pro
 #include <limits.h>
 #include <math.h>
 
+/**
+ * @brief Number of triggers per decade of increasing evaluations (20), was: 20
+ * 
+ * Changing this number currently breaks the test_logger_bbob.c unit-test
+ */
+#define OBSERVER_DEFAULT_NUMBER_OF_EVALUATION_TRIGGERS 20
+
+/**
+ * @brief Number of triggers per decade of decreasing Df values (20), was: 5, then 100
+ */
+#define OBSERVER_DEFAULT_NUMBER_OF_TARGET_TRIGGERS 20
+
 /**
  * @brief The type for triggers based on logarithmic target values (targets that
  * are uniformly distributed in the logarithmic space).
@@ -26229,14 +26241,16 @@ static void coco_observer_targets_free(coco_observer_targets_t *targets) {
  * dim*1, dim*2, dim*5, 10*dim*1, 10*dim*2, 10*dim*5, 100*dim*1, 100*dim*2,
  * 100*dim*5, ...
  */
-static coco_observer_evaluations_t *coco_observer_evaluations(const char *base_evaluations, const size_t dimension) {
+static coco_observer_evaluations_t *coco_observer_evaluations(const size_t number_evaluation_triggers, 
+                                                              const char *base_evaluations, 
+                                                              const size_t dimension) {
 
   coco_observer_evaluations_t *evaluations = (coco_observer_evaluations_t *)coco_allocate_memory(sizeof(*evaluations));
 
   /* First trigger */
   evaluations->value1 = 1;
   evaluations->exponent1 = 0;
-  evaluations->number_of_triggers = 20;
+  evaluations->number_of_triggers = number_evaluation_triggers;
 
   /* Second trigger */
   evaluations->base_evaluations =
@@ -26369,6 +26383,12 @@ static coco_observer_t *coco_observer_allocate(
   observer->logger_free_function = NULL;
   observer->restart_function = NULL;
   observer->is_active = 1;
+  coco_debug("Function coco_observer_allocate() called with values: result_folder: %s, observer_name: %s, algorithm_name: %s, "
+             "algorithm_info: %s, settings: %s, number_target_triggers: %lu, log_target_precision: %e, lin_target_precision: %e, "
+             "number_evaluation_triggers: %lu, base_evaluation_triggers: %s, precision_x: %d, precision_f: %d, precision_g: %d, "
+             "log_discrete_as_int: %d", result_folder, observer_name, algorithm_name, algorithm_info, settings, (unsigned long)number_target_triggers, 
+             log_target_precision, lin_target_precision, (unsigned long)number_evaluation_triggers, base_evaluation_triggers, precision_x, precision_f, 
+             precision_g, log_discrete_as_int);
   return observer;
 }
 
@@ -26557,6 +26577,11 @@ static void observer_bbob(coco_observer_t *observer, const char *options, coco_o
  */
 #define LOGGER_BBOB_INFEASIBLE_PENALTY 1e10
 
+/**
+ * Record variable values only when #variables is below this threshold, was: 22
+ */
+#define LOGGER_BBOB_NUMBER_OF_VARIABLES_THRESHOLD 7
+
 /**
  * @brief The bbob logger data type.
  */
@@ -26696,7 +26721,7 @@ static void logger_bbob_output(FILE *data_file, logger_bbob_data_t *logger, cons
     fprintf(data_file, "%+10.9e", best_value);
   }
 
-  if (logger->number_of_variables < 22) {
+  if (logger->number_of_variables < LOGGER_BBOB_NUMBER_OF_VARIABLES_THRESHOLD) {
     for (i = 0; i < logger->number_of_variables; i++) {
       if ((i < logger->number_of_integer_variables) && (logger->log_discrete_as_int))
         fprintf(data_file, " %d", coco_double_to_int(x[i]));
@@ -27235,8 +27260,8 @@ static coco_problem_t *logger_bbob(coco_observer_t *observer, coco_problem_t *in
   /* Initialize triggers performance and evaluation triggers depending on the observer option */
   logger_data->targets = coco_observer_targets(suite->known_optima, observer->lin_target_precision,
                                                observer->number_target_triggers, observer->log_target_precision);
-  logger_data->evaluations =
-      coco_observer_evaluations(observer->base_evaluation_triggers, inner_problem->number_of_variables);
+  logger_data->evaluations = coco_observer_evaluations(
+    observer->number_evaluation_triggers, observer->base_evaluation_triggers, inner_problem->number_of_variables);
   logger_data->mdat_targets = coco_observer_targets(suite->known_optima, observer->lin_target_precision,
                                                     observer->number_target_triggers, observer->log_target_precision);
 
@@ -27249,7 +27274,7 @@ static coco_problem_t *logger_bbob(coco_observer_t *observer, coco_problem_t *in
   observer_data->observed_problem = problem;
   return problem;
 }
-#line 498 "coco_observer.c"
+#line 518 "coco_observer.c"
 #line 1 "logger_bbob_old.c"
 /**
  * @file logger_bbob_old.c
@@ -27902,8 +27927,8 @@ static coco_problem_t *logger_bbob_old(coco_observer_t *observer, coco_problem_t
 
   /* Initialize triggers based on target values and number of evaluations */
   logger_data->targets = coco_observer_log_targets(observer->number_target_triggers, observer->log_target_precision);
-  logger_data->evaluations =
-      coco_observer_evaluations(observer->base_evaluation_triggers, inner_problem->number_of_variables);
+  logger_data->evaluations = coco_observer_evaluations(
+    observer->number_evaluation_triggers, observer->base_evaluation_triggers, inner_problem->number_of_variables);
 
   problem =
       coco_problem_transformed_allocate(inner_problem, logger_data, logger_bbob_old_free, observer->observer_name);
@@ -27912,7 +27937,7 @@ static coco_problem_t *logger_bbob_old(coco_observer_t *observer, coco_problem_t
   bbob_old_logger_is_open = 1;
   return problem;
 }
-#line 499 "coco_observer.c"
+#line 519 "coco_observer.c"
 #line 1 "logger_biobj.c"
 /**
  * @file logger_biobj.c
@@ -29599,7 +29624,8 @@ static logger_biobj_indicator_t *logger_biobj_indicator(const logger_biobj_data_
 
   indicator->targets = coco_observer_targets(suite->known_optima, observer->lin_target_precision,
                                              observer->number_target_triggers, observer->log_target_precision);
-  indicator->evaluations = coco_observer_evaluations(observer->base_evaluation_triggers, problem->number_of_variables);
+  indicator->evaluations = coco_observer_evaluations(observer->number_evaluation_triggers, observer->base_evaluation_triggers, 
+                                                     problem->number_of_variables);
 
   /* Prepare the info file */
   path_name = coco_allocate_string(COCO_PATH_MAX + 1);
@@ -30236,7 +30262,7 @@ static coco_problem_t *logger_biobj(coco_observer_t *observer, coco_problem_t *i
   observer_data->observed_problem = problem;
   return problem;
 }
-#line 500 "coco_observer.c"
+#line 520 "coco_observer.c"
 #line 1 "logger_rw.c"
 /**
  * @file logger_rw.c
@@ -30572,7 +30598,7 @@ static coco_problem_t *logger_rw(coco_observer_t *observer, coco_problem_t *inne
 
   return problem;
 }
-#line 501 "coco_observer.c"
+#line 521 "coco_observer.c"
 #line 1 "logger_toy.c"
 /**
  * @file logger_toy.c
@@ -30761,7 +30787,7 @@ static coco_problem_t *logger_toy(coco_observer_t *observer, coco_problem_t *inn
 
   return problem;
 }
-#line 502 "coco_observer.c"
+#line 522 "coco_observer.c"
 
 /**
  * Currently, four observers are supported:
@@ -30905,13 +30931,13 @@ coco_observer_t *coco_observer(const char *observer_name, const char *observer_o
     strcpy(settings, "");
   }
 
-  number_target_triggers = 100;
+  number_target_triggers = OBSERVER_DEFAULT_NUMBER_OF_TARGET_TRIGGERS;
   if (coco_options_read_size_t(observer_options, "number_target_triggers", &number_target_triggers) != 0) {
     if (number_target_triggers < 0) {
       coco_warning("coco_observer(): Unsuitable observer option value "
                    "(number_target_triggers: %lu) ignored",
                    number_target_triggers);
-      number_target_triggers = 100;
+      number_target_triggers = OBSERVER_DEFAULT_NUMBER_OF_TARGET_TRIGGERS;
     }
   }
 
@@ -30935,13 +30961,13 @@ coco_observer_t *coco_observer(const char *observer_name, const char *observer_o
     }
   }
 
-  number_evaluation_triggers = 20;
+  number_evaluation_triggers = OBSERVER_DEFAULT_NUMBER_OF_EVALUATION_TRIGGERS;
   if (coco_options_read_size_t(observer_options, "number_evaluation_triggers", &number_evaluation_triggers) != 0) {
     if (number_evaluation_triggers < 4) {
       coco_warning("coco_observer(): Unsuitable observer option value "
                    "(number_evaluation_triggers: %lu) ignored",
                    number_evaluation_triggers);
-      number_evaluation_triggers = 20;
+      number_evaluation_triggers = OBSERVER_DEFAULT_NUMBER_OF_EVALUATION_TRIGGERS;
     }
   }
 
@@ -31527,7 +31553,7 @@ void coco_archive_free(coco_archive_t *archive) {
  * don't change, don't track in version control!
  */
 
-const char *coco_version = "2.8.1";
+const char *coco_version = "2.8.3";
 #line 1 "coco_runtime_c.c"
 /**
  * @file coco_runtime_c.c

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/interface.pyx

@@ -424,7 +424,7 @@ cdef class Suite:
             % (self.name, self.instance, self.options,
                len(self), '' if len(self) == 1 else 's',
                '' if len(self.dimensions) == 1 else 's',
-               '%d=%d' % (min(self.dimensions), max(self.dimensions)))
+               '%d-%d' % (min(self.dimensions), max(self.dimensions)))
     def __len__(self):
         return len(self._indices)
 

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/noiser.py

@@ -52,11 +52,12 @@ class Noisifier:
         ### prepare
         suite = cocoex.Suite(suite_name, "", "")
         observer = cocoex.Observer(suite_name, "")
+        noisifier = cocoex.noiser.Noisifier()  # wrapper without internal state
 
         ### go
         for problem in suite:  # this loop may take several minutes or more
             problem.observe_with(observer)  # generates the data for cocopp
-            problem = cocoex.noiser.Noisifier().noisify(problem)  # a Noisifier
+            problem = noisifier.noisify(problem)  # wrap problem as noisy
             fmin(problem, problem.initial_solution, disp=False)
 
     The `problem` is now a `Noisifier` but it still abides by the interface
@@ -70,6 +71,24 @@ class Noisifier:
     noise generator and the numbers scaled by pi/2 such that P(number > k)
     equals about 1/k when k >= 5.
 
+    A minimal regression test:
+
+    >>> import cocoex
+    >>> def eq(x, y):
+    ...     return [cocoex.utilities.about_equal(xi, yi)
+    ...             for xi, yi in zip(x, y)]
+    >>> def fun(x):
+    ...     return 2 * x[0], 3 * x[1]
+
+    >>> n = cocoex.noiser.Noisifier(p_add=.5)
+    >>> f = n.noisify(fun)
+    >>> assert all(eq(f([1, 2]), [2, 41.39010606165791])
+    ...            ), f([1, 2])
+    >>> assert all(eq(f([2, 3, 4]), [11.518074565992698, 9.705537168513859])
+    ...            ), f([2, 3, 4])  # x[2:] have no influence here
+    >>> assert all(eq(f([-1, 2]), [-2, 6])
+    ...            ), f([-1, 2])
+
     See also https://github.com/numbbo/coco-experiment/issues/36 and
     https://github.com/numbbo/coco-experiment/blob/main/build/python/example/example_experiment_complete.py
 

{coco_experiment-2.8.1 → coco_experiment-2.8.3}/src/cocoex/utilities.py

@@ -269,7 +269,7 @@ class ProblemNonAnytime:
     ``p_unobserved.evaluations >= p_observed.evaluations``.
 
     """
-    inherited_constant_attributes = [
+    inherited_constant_attributes = [  # easier and better solved by defining __getattr__!?
             'dimension',
             'id',
             'index',
@@ -308,13 +308,14 @@ class ProblemNonAnytime:
         The method records the delivered solution (if necessary) and
         prepares the problem to be run on the next budget by calling
         `reset`.
+
+        Whether the evaluation is done is based on the comparison with the best
+        so-far fvalue, which is a hack. When the behavior of the solver is known, it is better to use::
+
+            problem(x)  # depending on whether this is necessary or not
+            problem.reset()
+
         """
-        if self.evaluations < self.p_observed.evaluations:
-            raise ValueError(
-                "Delivered solutions should come from increasing budgets,\n"
-                "however the current budget = {0} is smaller than the "
-                "delivery budget = {1}".format(
-                    self.p_observed.evaluations, self.evaluations))
         # assuming that "same fitness" means the solution was already evaluated
         if self.p_unobserved(x, *args, **kwargs) != self.best_observed_fvalue1:
             # ideally we would decrease the observed evaluation counter,
@@ -376,7 +377,7 @@ class SameFunction:
     >>> from cocoex.utilities import SameFunction
     >>>
     >>> suite = cocoex.Suite('bbob', '', '')
-    >>> already_seen = SameFunction()
+    >>> already_seen = seen = SameFunction()
     >>> processed = 0
     >>> for problem in suite:
     ...     if already_seen(problem.id) > 5: