v0.9.4

fun_control handling

Author: bartzbeielstein

notebooks/testKriging.ipynb

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

pyproject.toml

@@ -36,7 +36,7 @@
     get_fun_control_key_value,
 )
 import plotly.graph_objects as go
-from typing import List, Union, Callable, Dict
+from typing import Union, Callable, Dict
 
 
 logger = logging.getLogger(__name__)
@@ -200,12 +200,12 @@ def __init__(
         upper: np.array = None,
         fun_evals: int = 15,
         fun_repeats: int = 1,
-        fun_control: Dict[str, Union[int, float]] = {},
+        fun_control: dict = {},
         max_time: int = inf,
         noise: bool = False,
         tolerance_x: float = 0,
-        var_type: List[str] = ["num"],
-        var_name: List[str] = None,
+        var_type: list = ["num"],
+        var_name: list = None,
         infill_criterion: str = "y",
         n_points: int = 1,
         ocba_delta: int = 0,
@@ -246,6 +246,8 @@ def __init__(
         self.lower = lower
         if get_bound_values(self.fun_control, "lower") is not None:
             self.lower = get_bound_values(self.fun_control, "lower")
+        # Number of dimensions is based on lower
+        self.k = self.lower.size
 
         # if upper is in fun_control dictionary, use the value of the key "upper" as the upper bound
         # else use the upper bound upper
@@ -254,25 +256,22 @@ def __init__(
             self.upper = get_bound_values(self.fun_control, "upper")
 
         self.set_self_attribute("var_type", var_type, self.fun_control)
+        # Force numeric type as default in every dim:
+        # assume all variable types are "num" if "num" is
+        # specified less than k times
+        if len(self.var_type) < self.k:
+            self.var_type = self.var_type * self.k
+            logger.warning("All variable types forced to 'num'.")
+
         self.set_self_attribute("var_name", var_name, self.fun_control)
         # use x0, x1, ... as default variable names:
         if self.var_name is None:
             self.var_name = ["x" + str(i) for i in range(len(self.lower))]
 
-        # Number of dimensions:
-        self.k = self.lower.size
-
         # Reduce dim based on lower == upper logic:
         # modifies lower, upper, var_type, and var_name
         self.to_red_dim()
 
-        # Force numeric type as default in every dim:
-        # assume all variable types are "num" if "num" is
-        # specified less than k times
-        if len(self.var_type) < self.k:
-            self.var_type = self.var_type * self.k
-            logger.warning("All variable types forced to 'num'.")
-
         self.set_self_attribute("fun_evals", fun_evals, self.fun_control)
         self.set_self_attribute("fun_repeats", fun_repeats, self.fun_control)
         self.set_self_attribute("max_time", max_time, self.fun_control)
@@ -288,7 +287,7 @@ def __init__(
         # Random number generator:
         self.rng = default_rng(self.fun_control["seed"])
 
-        # Bounds are internal, because they are function of self.lower and self.upper
+        # Bounds are internal, because they are functions of self.lower and self.upper
         # and used by the optimizer:
         de_bounds = []
         for j in range(self.lower.size):

src/spotPython/spot/spot.py

@@ -14,7 +14,8 @@ def test_generate_design():
         lower=np.array([-5,0,1]),
         upper=np.array([10,15,3]),
         seed=1,
-        design_control={"init_size": ni}
+        design_control={"init_size": ni},
+        fun_control={}
     )
 
     X = spot_test.generate_design(size=spot_test.design_control["init_size"],
@@ -38,30 +39,32 @@ def test_generate_design():
         lower=np.array([-5,0,1]),
         upper=np.array([10,15,3]),
         seed=1,
-        design_control={"init_size": ni}
+        design_control={"init_size": ni},
+        fun_control={}
     )
 
     X3 = spot_test.generate_design(size=spot_test.design_control["init_size"],
                                    repeats=spot_test.design_control["repeats"],
                                    lower=spot_test.lower, 
                                    upper=spot_test.upper)
 
-    # spot_test = Spot(
-    #     fun=fun,
-    #     lower=np.array([-5,0,1]),
-    #     upper=np.array([10,15,3]),
-    #     seed=2,
-    #     design_control={"init_size": ni}
-    # )
+    spot_test = Spot(
+        fun=fun,
+        lower=np.array([-5,0,1]),
+        upper=np.array([10,15,3]),
+        seed=2,
+        design_control={"init_size": ni},
+        fun_control={}
+    )
 
-    # X4 = spot_test.generate_design(size=spot_test.design_control["init_size"],
-    #                                repeats=spot_test.design_control["repeats"],
-    #                                lower=spot_test.lower, 
-    #                                upper=spot_test.upper)
+    X4 = spot_test.generate_design(size=spot_test.design_control["init_size"],
+                                   repeats=spot_test.design_control["repeats"],
+                                   lower=spot_test.lower, 
+                                   upper=spot_test.upper)
 
     assert (X != X2).any()
     assert (X == X3).any()
-#    assert (X != X4).any()
+    assert (X != X4).any()
     assert (X2 != X3).any()
- #   assert (X2 != X4).any()
- #   assert (X3 != X4).any()
+    assert (X2 != X4).any()
+    assert (X3 != X4).any()

test/test_generate_design.py

@@ -0,0 +1,34 @@
+import numpy as np
+from spotPython.fun.objectivefunctions import analytical
+from spotPython.spot import spot
+
+def test_to_red():
+    """
+    Test to_red.
+    Test reduced dimensionality.
+    The first variable is not active, because it has
+    identical values (bounds).
+
+    """
+    # number of initial points:
+    ni = 10
+    # number of points
+    fun_evals = 10
+    fun = analytical().fun_sphere
+    lower = np.array([-1, -1, -1])
+    upper = np.array([-1, 1, 1])
+    design_control={"init_size": ni}
+    surrogate_control={"n_theta": 2}
+    spot_1 = spot.Spot(fun=fun,
+                lower = lower,
+                upper= upper,
+                fun_evals = fun_evals,
+                show_progress=True,
+                log_level=50,
+                design_control=design_control,
+                surrogate_control=surrogate_control,)
+    spot_1.run()
+    assert spot_1.lower.size == 2
+    assert spot_1.upper.size == 2
+    assert len(spot_1.var_type) == 2
+    assert spot_1.red_dim == True