coco-experiment 2.7.3__tar.gz → 2.7.5__tar.gz

{coco_experiment-2.7.3 → coco_experiment-2.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coco-experiment
-Version: 2.7.3
+Version: 2.7.5
 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.7.3 → coco_experiment-2.7.5}/meson.build

@@ -64,6 +64,7 @@ dep_numpy = declare_dependency(include_directories: inc_numpy, compile_args: cfl
 python_sources = [
   'src/cocoex/__init__.py',
   'src/cocoex/_version.py',
+  'src/cocoex/download_example.py',
   'src/cocoex/exceptions.py',
   'src/cocoex/noiser.py',
   'src/cocoex/solvers.py',

{coco_experiment-2.7.3 → coco_experiment-2.7.5}/src/cocoex/_version.py

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

{coco_experiment-2.7.3 → coco_experiment-2.7.5}/src/cocoex/coco.c

@@ -31526,7 +31526,7 @@ void coco_archive_free(coco_archive_t *archive) {
  * don't change, don't track in version control!
  */
 
-const char *coco_version = "2.7.3";
+const char *coco_version = "2.7.5";
 #line 1 "coco_runtime_c.c"
 /**
  * @file coco_runtime_c.c

coco_experiment-2.7.5/src/cocoex/download_example.py

@@ -0,0 +1,45 @@
+"""Download example scripts from GitHub to a local folder, by default `cocoex-example`
+in the current folder.
+
+Usage::
+
+    python -m cocoex.download_example [folder_name]
+
+"""
+import os
+import sys
+
+default_local_folder = 'cocoex-example'
+
+remote_folder = 'https://raw.githubusercontent.com/numbbo/coco-experiment/main/build/python/example/'
+
+file_names = ['mkl_bugfix.py', 
+        'example_experiment_simple.py',
+        'example_experiment_complete.py',
+        'example_experiment_non_anytime.py',
+        'example_experiment_parameter_sweep.py',
+        ]
+
+def main(folder=None):
+    """download example scripts from GitHub into `folder`, by default `./cocoex-example`"""
+    try:
+        import urllib.request
+    except ImportError:
+        print('Install urllib (`pip install urllib`) to download example')
+        raise
+    if folder is None:
+        folder = default_local_folder
+    if os.path.exists(folder):
+        raise ValueError('local target folder {0} already exists. Remove the folder\n'
+                         'or pass another folder name as argument to `cocoex.download_example`'
+                         .format(folder))
+    os.mkdir(folder)
+    for file_name in file_names:
+        with urllib.request.urlopen(remote_folder + file_name) as f:
+            d = f.read().decode('utf-8')
+        with open(folder + '/' + file_name, 'w') as f:
+            f.write(d)
+    print('  example scripts have been downloaded to {0}'.format(folder))
+
+if __name__ == '__main__':
+    main(sys.argv[1] if len(sys.argv) > 1 else None)

{coco_experiment-2.7.3 → coco_experiment-2.7.5}/src/cocoex/noiser.py

@@ -70,7 +70,8 @@ class Noisifier:
     noise generator and the numbers scaled by pi/2 such that P(number > k)
     equals about 1/k when k >= 5.
 
-    See also https://github.com/numbbo/coco-experiment/blob/main/build/python/example/example_experiment_complete.py
+    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
 
     """
     def __init__(self, p_add=0.2, p_subtract=0.0, p_epsilon=0, epsilon=1e-4,

{coco_experiment-2.7.3 → coco_experiment-2.7.5}/src/cocoex/utilities.py

@@ -722,6 +722,10 @@ class ExperimentRepeater:
             return [ii for ii in d if not d[ii]]  # list of instance numbers with no data
         return []
     @property
+    def sweep(self):
+        """current sweep/repetition number (starts with 1)"""
+        return self._sweeps
+    @property
     def n_problems(self):
         """current number of tracked problems (different ``(id_function, dimension)``)"""
         return sum(len(self.trials(k)) > 0 for k in self._data)
@@ -742,7 +746,13 @@ class ExperimentRepeater:
             return sum(self.trials(problem))
         return sum(self.all(self.n_trials).values())
     def track(self, problem):
-        """record problem instance evaluations and success (target hit)"""
+        """record problem instance evaluations and success (final target hit).
+
+        Track data to decide (later) whether more experiments or sweeps are
+        needed. `track` requires `problem` to have the attributes
+        ``id_function, dimension, id_instance, evaluations`` and
+        ``final_target_hit``.
+        """
         fun, dim, iinst = self.problem_to_ids(problem)
         if (fun, dim) not in self._data:
             self._data[(fun, dim)] = _collections.defaultdict(list)