v0.0.11 Nicer Outputs

Author: bartzbeielstein

notebooks/01_spot_intro.ipynb

@@ -141,7 +141,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x2917b7c40>"
+       "<spotPython.spot.spot.Spot at 0x16b45aaa0>"
       ]
      },
      "execution_count": 5,
@@ -163,7 +163,7 @@
      "output_type": "stream",
      "text": [
       "min y: 4.897545259852824e-10\n",
-      "min X: [[2.21303982e-05]]\n"
+      "x0: 2.2130398233770724e-05\n"
      ]
     }
    ],
@@ -243,7 +243,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x291aae7d0>"
+       "<spotPython.spot.spot.Spot at 0x16b84c610>"
       ]
      },
      "execution_count": 9,
@@ -280,25 +280,7 @@
      "output_type": "stream",
      "text": [
       "min y: 3.648984784366253e-07\n",
-      "min X: [[-0.00060407]]\n"
-     ]
-    }
-   ],
-   "source": [
-    "spot_1.print_results()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "min y: 3.648984784366253e-07\n",
-      "min X: [[-0.00060407]]\n"
+      "x0: -0.0006040682729929005\n"
      ]
     }
    ],

notebooks/02_spot_multidim.ipynb

@@ -103,7 +103,7 @@
     {
      "data": {
       "text/plain": [
-       "<spotPython.spot.spot.Spot at 0x288c37a00>"
+       "<spotPython.spot.spot.Spot at 0x29b1bf9a0>"
       ]
      },
      "execution_count": 3,
@@ -139,7 +139,9 @@
      "output_type": "stream",
      "text": [
       "min y: 5.9908343748136085e-05\n",
-      "min X: [[0.00515786 0.00195711 0.00542904]]\n"
+      "Pressure: 0.005157864627379999\n",
+      "Temp: 0.00195710957248863\n",
+      "Lambda: 0.005429042121316765\n"
      ]
     }
    ],
@@ -273,9 +275,9 @@
      "output_type": "stream",
      "text": [
       "Importance relative to the most important parameter:\n",
-      "Parameter 0 :  100.0\n",
-      "Parameter 1 :  99.78247670817808\n",
-      "Parameter 2 :  94.72233826625329\n"
+      "Pressure:  100.0\n",
+      "Temp:  99.78247670817808\n",
+      "Lambda:  94.72233826625329\n"
      ]
     }
    ],

pyproject.toml

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

src/spotPython/spot/spot.py

@@ -537,10 +537,20 @@ def print_results(self):
             4. min mean X
         """
         print(f"min y: {self.min_y}")
-        print(f"min X: {self.to_all_dim(self.min_X.reshape(1, -1))}")
+        res = self.to_all_dim(self.min_X.reshape(1, -1))
+        for i in range(res.shape[1]):
+            if self.var_name is None:
+                print("x" + str(i) + ":", res[0][i])
+            else:
+                print(self.var_name[i] + ":", res[0][i])
         if self.noise:
+            res = self.to_all_dim(self.min_mean_X.reshape(1, -1))
             print(f"min mean y: {self.min_mean_y}")
-            print(f"min mean X: {self.to_all_dim(self.min_mean_X.reshape(1, -1))}")
+            for i in range(res.shape[1]):
+                if self.var_name is None:
+                    print("x" + str(i) + ":", res[0][i])
+                else:
+                    print(self.var_name[i] + ":", res[0][i])
 
     def chg(self, x, y, z0, i, j):
         z0[i] = x
@@ -598,5 +608,9 @@ def print_importance(self):
         theta = np.power(10, self.surrogate.theta)
         print("Importance relative to the most important parameter:")
         imp = 100 * theta / np.max(theta)
-        for i in range(len(imp)):
-            print("Parameter", i, ": ", imp[i])
+        if self.var_name is None:
+            for i in range(len(imp)):
+                print("x", i, ": ", imp[i])
+        else:
+            for i in range(len(imp)):
+                print(self.var_name[i] + ": ", imp[i])

src/spotPython/utils/progress.py

@@ -26,8 +26,6 @@ def progress_bar(progress, bar_length=10, message="spotPython tuning:"):
         progress = 1
         status = "Done...\r\n"
     block = int(round(bar_length * progress))
-    text = message + " [{0}] {1:.2f}% {2}\r".format(
-        "#" * block + "-" * (bar_length - block), progress * 100, status
-    )
+    text = message + " [{0}] {1:.2f}% {2}\r".format("#" * block + "-" * (bar_length - block), progress * 100, status)
     stdout.write(text)
     stdout.flush()