Update exercise 5

Author: timmens

src/scipy_dev/notebooks/05_bounds_and_constraints.ipynb

@@ -33,9 +33,9 @@
     "import numpy as np\n",
     "\n",
     "def criterion(x):\n",
-    "    first = (x[\"a\"] - np.pi) ** 4 \n",
-    "    second =  np.linalg.norm(x[\"b\"] - np.arange(3))\n",
-    "    third = np.linalg.norm(x[\"c\"] - np.eye(2))\n",
+    "    first = (x[\"a\"] - np.pi) ** 2\n",
+    "    second =  np.sum((x[\"b\"] - np.arange(3)) ** 2)\n",
+    "    third = np.sum((x[\"c\"] - np.eye(2)) ** 2)\n",
     "    return first + second + third\n",
     "    \n",
     "    \n",
@@ -55,10 +55,10 @@
     {
      "data": {
       "text/plain": [
-       "{'a': 2.743115791004308,\n",
-       " 'b': array([7.20526405e-06, 1.00000542e+00, 1.99999951e+00]),\n",
-       " 'c': array([[ 1.00000752e+00, -1.83976834e-06],\n",
-       "        [ 5.75654246e-06,  1.00000339e+00]])}"
+       "{'a': 3.141592653589793,\n",
+       " 'b': array([1.55630437e-16, 1.00000000e+00, 2.00000000e+00]),\n",
+       " 'c': array([[ 1.00000000e+00, -4.50891722e-18],\n",
+       "        [-4.51479888e-18,  1.00000000e+00]])}"
       ]
      },
      "execution_count": 2,

src/scipy_dev/notebooks/solutions/05_bounds_and_constraints.ipynb

@@ -33,9 +33,9 @@
     "import numpy as np\n",
     "\n",
     "def criterion(x):\n",
-    "    first = (x[\"a\"] - np.pi) ** 4 \n",
-    "    second =  np.linalg.norm(x[\"b\"] - np.arange(3))\n",
-    "    third = np.linalg.norm(x[\"c\"] - np.eye(2))\n",
+    "    first = (x[\"a\"] - np.pi) ** 2\n",
+    "    second =  np.sum((x[\"b\"] - np.arange(3)) ** 2)\n",
+    "    third = np.sum((x[\"c\"] - np.eye(2)) ** 2)\n",
     "    return first + second + third\n",
     "    \n",
     "    \n",
@@ -55,10 +55,10 @@
     {
      "data": {
       "text/plain": [
-       "{'a': 2.743115791004308,\n",
-       " 'b': array([7.20526405e-06, 1.00000542e+00, 1.99999951e+00]),\n",
-       " 'c': array([[ 1.00000752e+00, -1.83976834e-06],\n",
-       "        [ 5.75654246e-06,  1.00000339e+00]])}"
+       "{'a': 3.141592653589793,\n",
+       " 'b': array([1.55630437e-16, 1.00000000e+00, 2.00000000e+00]),\n",
+       " 'c': array([[ 1.00000000e+00, -4.50891722e-18],\n",
+       "        [-4.51479888e-18,  1.00000000e+00]])}"
       ]
      },
      "execution_count": 2,
@@ -98,9 +98,9 @@
      "data": {
       "text/plain": [
        "{'a': 2.0,\n",
-       " 'b': array([0.5       , 1.11950355, 1.82926046]),\n",
-       " 'c': array([[1.00000104e+00, 1.57485251e-06],\n",
-       "        [5.38584210e-06, 1.00000320e+00]])}"
+       " 'b': array([0.5, 1. , 2. ]),\n",
+       " 'c': array([[1., 0.],\n",
+       "        [0., 1.]])}"
       ]
      },
      "execution_count": 3,
@@ -142,9 +142,9 @@
      "data": {
       "text/plain": [
        "{'a': 1.0,\n",
-       " 'b': array([1.30231301e-06, 1.00000089e+00, 2.00000549e+00]),\n",
-       " 'c': array([[1.02551721, 1.        ],\n",
-       "        [0.05069564, 0.9944641 ]])}"
+       " 'b': array([0., 1., 2.]),\n",
+       " 'c': array([[1., 1.],\n",
+       "        [0., 1.]])}"
       ]
      },
      "execution_count": 4,
@@ -188,17 +188,17 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "/Users/Tim_Mensinger/miniconda3/envs/scipy-estimagic/lib/python3.9/site-packages/pandas/core/frame.py:6254: FutureWarning: In a future version, the Index constructor will not infer numeric dtypes when passed object-dtype sequences (matching Series behavior)\n",
+      "/Users/Tim_Mensinger/miniconda3/envs/scipy-test/lib/python3.9/site-packages/pandas/core/frame.py:6254: FutureWarning: In a future version, the Index constructor will not infer numeric dtypes when passed object-dtype sequences (matching Series behavior)\n",
       "  diff = Index(subset).difference(self.columns)\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "{'a': 2.855857369098579,\n",
-       " 'b': array([-1.03938095e-06,  1.00000208e+00,  1.99999922e+00]),\n",
-       " 'c': array([[ 0.32051835,  0.03349061],\n",
-       "        [-0.00143225,  0.64742329]])}"
+       "{'a': 3.1415928282824384,\n",
+       " 'b': array([-7.47836576e-09,  9.99999785e-01,  2.00000000e+00]),\n",
+       " 'c': array([[ 0.75000093, -0.24999997],\n",
+       "        [-0.25000073,  0.74999977]])}"
       ]
      },
      "execution_count": 5,