0.27.14

Author: bartzbeielstein

notebooks/00_spotPython_tests.ipynb

@@ -13208,8 +13208,90 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
-   "source": []
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "array([11, 12, 13])"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "import pytest\n",
+    "import numpy as np\n",
+    "from spotpython.utils.parallel import evaluate_row\n",
+    "\n",
+    "def sample_objective(row, control):\n",
+    "    return row + control.get('offset', 0)\n",
+    "\n",
+    "def test_evaluate_row_with_list():\n",
+    "    row = [1, 2, 3]\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([11, 12, 13])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_ndarray():\n",
+    "    row = np.array([1, 2, 3])\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([11, 12, 13])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_without_offset():\n",
+    "    row = np.array([4, 5, 6])\n",
+    "    fun_control = {}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([4, 5, 6])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_different_offset():\n",
+    "    row = np.array([7, 8, 9])\n",
+    "    fun_control = {'offset': -5}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([2, 3, 4])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_float_values():\n",
+    "    row = np.array([1.5, 2.5, 3.5])\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([11.5, 12.5, 13.5])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_negative_values():\n",
+    "    row = np.array([-1, -2, -3])\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([9, 8, 7])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_zero_values():\n",
+    "    row = np.array([0, 0, 0])\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([10, 10, 10])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\"\n",
+    "\n",
+    "def test_evaluate_row_with_empty_row():\n",
+    "    row = np.array([])\n",
+    "    fun_control = {'offset': 10}\n",
+    "    result = evaluate_row(row, sample_objective, fun_control)\n",
+    "    result = np.squeeze(result)  # Remove the extra dimension\n",
+    "    expected_result = np.array([])\n",
+    "    assert np.array_equal(result, expected_result), f\"Expected {expected_result}, but got {result}\""
+   ]
   }
  ],
  "metadata": {

pyproject.toml

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

test/test_parallel.py

@@ -0,0 +1,70 @@
+import pytest
+import numpy as np
+from spotpython.utils.parallel import evaluate_row
+
+def sample_objective(row, control):
+    return row + control.get('offset', 0)
+
+def test_evaluate_row_with_list():
+    row = [1, 2, 3]
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([11, 12, 13])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_ndarray():
+    row = np.array([1, 2, 3])
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([11, 12, 13])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_without_offset():
+    row = np.array([4, 5, 6])
+    fun_control = {}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([4, 5, 6])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_different_offset():
+    row = np.array([7, 8, 9])
+    fun_control = {'offset': -5}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([2, 3, 4])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_float_values():
+    row = np.array([1.5, 2.5, 3.5])
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([11.5, 12.5, 13.5])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_negative_values():
+    row = np.array([-1, -2, -3])
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([9, 8, 7])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_zero_values():
+    row = np.array([0, 0, 0])
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([10, 10, 10])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"
+
+def test_evaluate_row_with_empty_row():
+    row = np.array([])
+    fun_control = {'offset': 10}
+    result = evaluate_row(row, sample_objective, fun_control)
+    result = np.squeeze(result)  # Remove the extra dimension
+    expected_result = np.array([])
+    assert np.array_equal(result, expected_result), f"Expected {expected_result}, but got {result}"