v0.0.12

bartzbeielstein · bartzbeielstein · commit 3a5b6fe3635a · 2023-02-17T15:53:54.000+01:00
diff --git a/notebooks/00_spot_doc.ipynb b/notebooks/00_spot_doc.ipynb
diff --git a/notebooks/01_spot_intro.ipynb b/notebooks/01_spot_intro.ipynb
@@ -141,7 +141,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x16b45aaa0>"
+       "<spotPython.spot.spot.Spot at 0x28b72bd30>"
       ]
      },
      "execution_count": 5,
@@ -243,7 +243,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x16b84c610>"
+       "<spotPython.spot.spot.Spot at 0x28c3fc550>"
       ]
      },
      "execution_count": 9,
@@ -298,7 +298,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
diff --git a/notebooks/02_spot_multidim.ipynb b/notebooks/02_spot_multidim.ipynb
@@ -111,7 +111,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x1578379d0>"
+       "<spotPython.spot.spot.Spot at 0x16b7fb9a0>"
       ]
      },
      "execution_count": 3,
diff --git a/notebooks/03_spot_anisotropic.ipynb b/notebooks/03_spot_anisotropic.ipynb
@@ -83,7 +83,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x287767850>"
+       "<spotPython.spot.spot.Spot at 0x17f39b6a0>"
       ]
      },
      "execution_count": 3,
@@ -117,7 +117,8 @@
      "output_type": "stream",
      "text": [
       "min y: 1.8750731199649933e-05\n",
-      "min X: [[0.00151305 0.00405727]]\n"
+      "x0: 0.0015130475553084242\n",
+      "x1: 0.0040572673433020325\n"
      ]
     }
    ],
@@ -173,7 +174,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x287a85a80>"
+       "<spotPython.spot.spot.Spot at 0x17f885960>"
       ]
      },
      "execution_count": 6,
@@ -292,7 +293,8 @@
      "output_type": "stream",
      "text": [
       "min y: 5.68261952864018e-06\n",
-      "min X: [[-0.00213704 -0.00105626]]\n"
+      "x0: -0.002137037687426695\n",
+      "x1: -0.0010562620182313395\n"
      ]
     }
    ],
diff --git a/notebooks/04_spot_sklearn_surrogate.ipynb b/notebooks/04_spot_sklearn_surrogate.ipynb
diff --git a/notebooks/05_spot_sklearn_optimizers.ipynb b/notebooks/05_spot_sklearn_optimizers.ipynb
@@ -124,7 +124,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x106c8bb80>"
+       "<spotPython.spot.spot.Spot at 0x104e8b2b0>"
       ]
      },
      "execution_count": 4,
@@ -167,7 +167,8 @@
      "output_type": "stream",
      "text": [
       "min y: 0.39969164980122684\n",
-      "min X: [[-3.15822445 12.29318228]]\n"
+      "x0: -3.158224446089584\n",
+      "x1: 12.293182279400076\n"
      ]
     }
    ],
diff --git a/notebooks/06_spot_gaussian.ipynb b/notebooks/06_spot_gaussian.ipynb
diff --git a/notebooks/07_spot_ei.ipynb b/notebooks/07_spot_ei.ipynb
diff --git a/notebooks/08_spot_noisy.ipynb b/notebooks/08_spot_noisy.ipynb
@@ -168,7 +168,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x28af6e260>"
+       "<spotPython.spot.spot.Spot at 0x29404e860>"
       ]
      },
      "execution_count": 5,
@@ -198,9 +198,9 @@
      "output_type": "stream",
      "text": [
       "min y: -0.06415721592502649\n",
-      "min X: [[0.18642671]]\n",
+      "x0: 0.18642671243617048\n",
       "min mean y: -0.033090480981028104\n",
-      "min mean X: [[0.18642671]]\n"
+      "x0: 0.18642671243617048\n"
      ]
     }
    ],
diff --git a/notebooks/09_spot_ocba.ipynb b/notebooks/09_spot_ocba.ipynb
@@ -301,7 +301,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x13b6d6260>"
+       "<spotPython.spot.spot.Spot at 0x29197ffa0>"
       ]
      },
      "execution_count": 5,
@@ -331,9 +331,9 @@
      "output_type": "stream",
      "text": [
       "min y: -0.08106318979737473\n",
-      "min X: [[0.13359994]]\n",
+      "x0: 0.13359994475077583\n",
       "min mean y: -0.06294830660664306\n",
-      "min mean X: [[0.13359994]]\n"
+      "x0: 0.13359994475077583\n"
      ]
     }
    ],
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spotPython"
-version = "0.0.11"
+version = "0.0.12"
 authors = [
   { name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
 ]
diff --git a/src/spotPython/spot/spot.py b/src/spotPython/spot/spot.py
@@ -131,6 +131,7 @@ def __init__(
         tolerance_x=0,
         var_type=["num"],
         var_name=None,
+        all_var_name=None,
         infill_criterion="y",
         n_points=1,
         ocba_delta=0,
@@ -152,6 +153,7 @@ def __init__(
         self.upper = upper
         self.var_type = var_type
         self.var_name = var_name
+        self.all_var_name = all_var_name
         # Reduce dim based on lower == upper logic:
         # modifies lower, upper, and var_type
         self.to_red_dim()
@@ -547,7 +549,7 @@ def print_results(self):
             res = self.to_all_dim(self.min_mean_X.reshape(1, -1))
             print(f"min mean y: {self.min_mean_y}")
             for i in range(res.shape[1]):
-                if self.self.all_var_name is None:
+                if self.all_var_name is None:
                     print("x" + str(i) + ":", res[0][i])
                 else:
                     print(self.all_var_name[i] + ":", res[0][i])

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@`
`141`	`141`	`{`
`142`	`142`	`"data": {`
`143`	`143`	`"text/plain": [`
`144`		`- "<spotPython.spot.spot.Spot at 0x16b45aaa0>"`
	`144`	`+ "<spotPython.spot.spot.Spot at 0x28b72bd30>"`
`145`	`145`	`]`
`146`	`146`	`},`
`147`	`147`	`"execution_count": 5,`
`@@ -243,7 +243,7 @@`
`243`	`243`	`{`
`244`	`244`	`"data": {`
`245`	`245`	`"text/plain": [`
`246`		`- "<spotPython.spot.spot.Spot at 0x16b84c610>"`
	`246`	`+ "<spotPython.spot.spot.Spot at 0x28c3fc550>"`
`247`	`247`	`]`
`248`	`248`	`},`
`249`	`249`	`"execution_count": 9,`
`@@ -298,7 +298,7 @@`
`298`	`298`	`},`
`299`	`299`	`{`
`300`	`300`	`"cell_type": "code",`
`301`		`- "execution_count": 12,`
	`301`	`+ "execution_count": 11,`
`302`	`302`	`"metadata": {},`
`303`	`303`	`"outputs": [`
`304`	`304`	`{`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@`
`111`	`111`	`{`
`112`	`112`	`"data": {`
`113`	`113`	`"text/plain": [`
`114`		`- "<spotPython.spot.spot.Spot at 0x1578379d0>"`
	`114`	`+ "<spotPython.spot.spot.Spot at 0x16b7fb9a0>"`
`115`	`115`	`]`
`116`	`116`	`},`
`117`	`117`	`"execution_count": 3,`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@`
`83`	`83`	`{`
`84`	`84`	`"data": {`
`85`	`85`	`"text/plain": [`
`86`		`- "<spotPython.spot.spot.Spot at 0x287767850>"`
	`86`	`+ "<spotPython.spot.spot.Spot at 0x17f39b6a0>"`
`87`	`87`	`]`
`88`	`88`	`},`
`89`	`89`	`"execution_count": 3,`
`@@ -117,7 +117,8 @@`
`117`	`117`	`"output_type": "stream",`
`118`	`118`	`"text": [`
`119`	`119`	`"min y: 1.8750731199649933e-05\n",`
`120`		`- "min X: [[0.00151305 0.00405727]]\n"`
	`120`	`+ "x0: 0.0015130475553084242\n",`
	`121`	`+ "x1: 0.0040572673433020325\n"`
`121`	`122`	`]`
`122`	`123`	`}`
`123`	`124`	`],`
`@@ -173,7 +174,7 @@`
`173`	`174`	`{`
`174`	`175`	`"data": {`
`175`	`176`	`"text/plain": [`
`176`		`- "<spotPython.spot.spot.Spot at 0x287a85a80>"`
	`177`	`+ "<spotPython.spot.spot.Spot at 0x17f885960>"`
`177`	`178`	`]`
`178`	`179`	`},`
`179`	`180`	`"execution_count": 6,`
`@@ -292,7 +293,8 @@`
`292`	`293`	`"output_type": "stream",`
`293`	`294`	`"text": [`
`294`	`295`	`"min y: 5.68261952864018e-06\n",`
`295`		`- "min X: [[-0.00213704 -0.00105626]]\n"`
	`296`	`+ "x0: -0.002137037687426695\n",`
	`297`	`+ "x1: -0.0010562620182313395\n"`
`296`	`298`	`]`
`297`	`299`	`}`
`298`	`300`	`],`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@`
`124`	`124`	`{`
`125`	`125`	`"data": {`
`126`	`126`	`"text/plain": [`
`127`		`- "<spotPython.spot.spot.Spot at 0x106c8bb80>"`
	`127`	`+ "<spotPython.spot.spot.Spot at 0x104e8b2b0>"`
`128`	`128`	`]`
`129`	`129`	`},`
`130`	`130`	`"execution_count": 4,`
`@@ -167,7 +167,8 @@`
`167`	`167`	`"output_type": "stream",`
`168`	`168`	`"text": [`
`169`	`169`	`"min y: 0.39969164980122684\n",`
`170`		`- "min X: [[-3.15822445 12.29318228]]\n"`
	`170`	`+ "x0: -3.158224446089584\n",`
	`171`	`+ "x1: 12.293182279400076\n"`
`171`	`172`	`]`
`172`	`173`	`}`
`173`	`174`	`],`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`{`
`169`	`169`	`"data": {`
`170`	`170`	`"text/plain": [`
`171`		`- "<spotPython.spot.spot.Spot at 0x28af6e260>"`
	`171`	`+ "<spotPython.spot.spot.Spot at 0x29404e860>"`
`172`	`172`	`]`
`173`	`173`	`},`
`174`	`174`	`"execution_count": 5,`
`@@ -198,9 +198,9 @@`
`198`	`198`	`"output_type": "stream",`
`199`	`199`	`"text": [`
`200`	`200`	`"min y: -0.06415721592502649\n",`
`201`		`- "min X: [[0.18642671]]\n",`
	`201`	`+ "x0: 0.18642671243617048\n",`
`202`	`202`	`"min mean y: -0.033090480981028104\n",`
`203`		`- "min mean X: [[0.18642671]]\n"`
	`203`	`+ "x0: 0.18642671243617048\n"`
`204`	`204`	`]`
`205`	`205`	`}`
`206`	`206`	`],`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@`
`301`	`301`	`{`
`302`	`302`	`"data": {`
`303`	`303`	`"text/plain": [`
`304`		`- "<spotPython.spot.spot.Spot at 0x13b6d6260>"`
	`304`	`+ "<spotPython.spot.spot.Spot at 0x29197ffa0>"`
`305`	`305`	`]`
`306`	`306`	`},`
`307`	`307`	`"execution_count": 5,`
`@@ -331,9 +331,9 @@`
`331`	`331`	`"output_type": "stream",`
`332`	`332`	`"text": [`
`333`	`333`	`"min y: -0.08106318979737473\n",`
`334`		`- "min X: [[0.13359994]]\n",`
	`334`	`+ "x0: 0.13359994475077583\n",`
`335`	`335`	`"min mean y: -0.06294830660664306\n",`
`336`		`- "min mean X: [[0.13359994]]\n"`
	`336`	`+ "x0: 0.13359994475077583\n"`
`337`	`337`	`]`
`338`	`338`	`}`
`339`	`339`	`],`