0.10.5

plot test

Author: bartzbeielstein

.gitignore

@@ -304,3 +304,5 @@ lightning_logs/*
 runs/*
 src/spotPython/data/pkldataset_intern.py
 runs_OLD/*
+test_plot.png
+plot.png

notebooks/00_spotPython_tests.ipynb

@@ -1867,17 +1867,9 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 3,
+      "execution_count": null,
       "metadata": {},
-      "outputs": [
-        {
-          "name": "stderr",
-          "output_type": "stream",
-          "text": [
-            "Seed set to 1234\n"
-          ]
-        }
-      ],
+      "outputs": [],
       "source": [
         "from spotPython.utils.device import getDevice\n",
         "from spotPython.utils.init import fun_control_init\n",
@@ -1921,20 +1913,9 @@
     },
     {
       "cell_type": "code",
-      "execution_count": 3,
+      "execution_count": null,
       "metadata": {},
-      "outputs": [
-        {
-          "data": {
-            "text/plain": [
-              "'20240106142611888678'"
-            ]
-          },
-          "execution_count": 3,
-          "metadata": {},
-          "output_type": "execute_result"
-        }
-      ],
+      "outputs": [],
       "source": [
         "import datetime\n",
         "\n",
@@ -1949,6 +1930,59 @@
         "    return dt\n"
       ]
     },
+    {
+      "cell_type": "code",
+      "execution_count": 1,
+      "metadata": {},
+      "outputs": [
+        {
+          "name": "stderr",
+          "output_type": "stream",
+          "text": [
+            "Seed set to 123\n"
+          ]
+        }
+      ],
+      "source": [
+        "import pytest\n",
+        "import numpy as np\n",
+        "from spotPython.fun.objectivefunctions import analytical\n",
+        "from spotPython.spot import spot\n",
+        "from spotPython.utils.init import (\n",
+        "    fun_control_init, surrogate_control_init, design_control_init\n",
+        ")\n",
+        "\n",
+        "def test_plot_progress():\n",
+        "    # number of initial points:\n",
+        "    ni = 7\n",
+        "    # number of points\n",
+        "    fun_evals = 10\n",
+        "    fun = analytical().fun_sphere\n",
+        "    fun_control = fun_control_init(\n",
+        "        lower = np.array([-1, -1]),\n",
+        "        upper = np.array([1, 1]),\n",
+        "        fun_evals=fun_evals,\n",
+        "        tolerance_x = np.sqrt(np.spacing(1))\n",
+        "    )\n",
+        "    design_control=design_control_init(init_size=ni)\n",
+        "    surrogate_control=surrogate_control_init(n_theta=3)\n",
+        "    S = spot.Spot(fun=fun,\n",
+        "                    fun_control=fun_control,\n",
+        "                    design_control=design_control,\n",
+        "                    surrogate_control=surrogate_control,)\n",
+        "    S.run()\n",
+        "\n",
+        "    # Test plot_progress with different parameters\n",
+        "    S.plot_progress(show=False)  # Test with show=False\n",
+        "    S.plot_progress(log_x=True, show=False)  # Test with log_x=True\n",
+        "    S.plot_progress(log_y=True, show=False)  # Test with log_y=True\n",
+        "    S.plot_progress(filename=\"test_plot.png\", show=False)  # Test with a different filename\n",
+        "    # add NaN to S.y at position 2\n",
+        "    S.y[2] = np.nan\n",
+        "    S.plot_progress(show=False)  # Test with show=False\n",
+        "\n"
+      ]
+    },
     {
       "cell_type": "code",
       "execution_count": null,

pyproject.toml

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

test/test_plot_progress.py

@@ -0,0 +1,36 @@
+import pytest
+import numpy as np
+from spotPython.fun.objectivefunctions import analytical
+from spotPython.spot import spot
+from spotPython.utils.init import (
+    fun_control_init, surrogate_control_init, design_control_init
+)
+
+def test_plot_progress():
+    # number of initial points:
+    ni = 7
+    # number of points
+    fun_evals = 10
+    fun = analytical().fun_sphere
+    fun_control = fun_control_init(
+        lower = np.array([-1, -1]),
+        upper = np.array([1, 1]),
+        fun_evals=fun_evals,
+        tolerance_x = np.sqrt(np.spacing(1))
+    )
+    design_control=design_control_init(init_size=ni)
+    surrogate_control=surrogate_control_init(n_theta=3)
+    S = spot.Spot(fun=fun,
+                    fun_control=fun_control,
+                    design_control=design_control,
+                    surrogate_control=surrogate_control,)
+    S.run()
+
+    # Test plot_progress with different parameters
+    S.plot_progress(show=False)  # Test with show=False
+    S.plot_progress(log_x=True, show=False)  # Test with log_x=True
+    S.plot_progress(log_y=True, show=False)  # Test with log_y=True
+    S.plot_progress(filename="test_plot.png", show=False)  # Test with a different filename
+    # add NaN to S.y at position 2
+    S.y[2] = np.nan
+    S.plot_progress(show=False)  # Test with NaN in S.y