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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coco-experiment
-Version: 2.8.1
+Version: 2.8.2
 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/

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

@@ -35,7 +35,9 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
 ]
-dependencies = ["numpy >= 1.24.0"]
+dependencies = [
+    "numpy >= 1.24.0",
+]
 dynamic = ["version"]
 
 [project.urls]
@@ -48,7 +50,7 @@ where = ["src"]
 
 [tool.pytest]
 log_cli = true
-addopts = "--doctest-modules"
+addopts = ["--doctest-modules"]
 
 [tool.cibuildwheel]
 build-frontend = "build"
@@ -71,3 +73,8 @@ include = [
 
 [tool.hatch.version]
 path = "src/cocoex/_version.py"
+
+[dependency-groups]
+dev = [
+    "build>=1.2",
+]

{coco_experiment-2.8.1 → coco_experiment-2.8.2}/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.2"
 version = __version__
 
 if __name__ == "__main__":

{coco_experiment-2.8.1 → coco_experiment-2.8.2}/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).
@@ -26236,7 +26248,7 @@ static coco_observer_evaluations_t *coco_observer_evaluations(const char *base_e
   /* First trigger */
   evaluations->value1 = 1;
   evaluations->exponent1 = 0;
-  evaluations->number_of_triggers = 20;
+  evaluations->number_of_triggers = OBSERVER_DEFAULT_NUMBER_OF_EVALUATION_TRIGGERS;
 
   /* Second trigger */
   evaluations->base_evaluations =
@@ -26557,6 +26569,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 +26713,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]));
@@ -27249,7 +27266,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 510 "coco_observer.c"
 #line 1 "logger_bbob_old.c"
 /**
  * @file logger_bbob_old.c
@@ -27912,7 +27929,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 511 "coco_observer.c"
 #line 1 "logger_biobj.c"
 /**
  * @file logger_biobj.c
@@ -30236,7 +30253,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 512 "coco_observer.c"
 #line 1 "logger_rw.c"
 /**
  * @file logger_rw.c
@@ -30572,7 +30589,7 @@ static coco_problem_t *logger_rw(coco_observer_t *observer, coco_problem_t *inne
 
   return problem;
 }
-#line 501 "coco_observer.c"
+#line 513 "coco_observer.c"
 #line 1 "logger_toy.c"
 /**
  * @file logger_toy.c
@@ -30761,7 +30778,7 @@ static coco_problem_t *logger_toy(coco_observer_t *observer, coco_problem_t *inn
 
   return problem;
 }
-#line 502 "coco_observer.c"
+#line 514 "coco_observer.c"
 
 /**
  * Currently, four observers are supported:
@@ -30905,13 +30922,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 +30952,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 +31544,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.2";
 #line 1 "coco_runtime_c.c"
 /**
  * @file coco_runtime_c.c

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

@@ -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,