0.9.20

add noise to fun_control init

Author: bartzbeielstein

pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spotPython"
-version = "0.9.19"
+version = "0.9.20"
 authors = [
   { name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
 ]

src/spotPython/utils/init.py

@@ -19,6 +19,7 @@ def fun_control_init(
     fun_repeats=1,
     log_level=50,
     max_time=1,
+    noise=False,
     num_workers=0,
     seed=1234,
     sigma=0.0,
@@ -58,6 +59,9 @@ def fun_control_init(
             The log level. Default is 50 (ERROR).
         max_time (int):
             The maximum time in minutes.
+        noise (bool):
+            Whether the objective function is noiy or not. Default is False.
+            Affects the repeat of the function evaluations.
         num_workers (int):
             The number of workers to use for the data loading. Default is 0.
         seed (int):
@@ -108,6 +112,7 @@ def fun_control_init(
                 'metric_torch': None,
                 'metric_params': {},
                 'model_dict': {},
+                'noise': False,
                 'n_samples': None,
                 'num_workers': 0,
                 'optimizer': None,
@@ -186,6 +191,7 @@ def fun_control_init(
         "metric_torch": None,
         "metric_params": {},
         "model_dict": {},
+        "noise": noise,
         "n_samples": None,
         "num_workers": num_workers,
         "optimizer": None,

test/test_update_design.py

@@ -35,14 +35,14 @@ def test_update_design_with_repeats_and_ocba():
     fun = analytical().fun_sphere
     fun_control = fun_control_init(
             sigma=0.02,
-            seed=123,)
+            seed=123,
+            noise=True,
+            fun_repeats=2)
     lower = np.array([-1, -1])
     upper = np.array([1, 1])
     design_control={"init_size": ni,
                     "repeats": 2}
     S = spot.Spot(fun=fun,
-                noise=True,
-                fun_repeats=2,
                 n_points=1,
                 ocba_delta=1,
                 lower = lower,
@@ -70,14 +70,15 @@ def test_update_design_with_repeats_and_ocba_no_var():
     fun = analytical().fun_sphere
     fun_control = fun_control_init(
             sigma=0.02,
-            seed=123,)
+            seed=123,
+            noise=True,
+            fun_repeats=2,)
     lower = np.array([-1, -1])
     upper = np.array([1, 1])
     design_control={"init_size": ni,
                     "repeats": 2}
     S = spot.Spot(fun=fun,
                 noise=True,
-                fun_repeats=2,
                 n_points=1,
                 ocba_delta=1,
                 lower = lower,