Merge branch 'refs/heads/develop' into 410-bug-incorrect-axis-symbol-…

…rendering-formu-in-notebooks
pybop-team · Sep 6, 2024 · 7e3d787 · 7e3d787
1 parent 1fb5bcf
commit 7e3d787
Show file tree

Hide file tree

Showing 13 changed files with 600 additions and 2,398 deletions.
diff --git a/examples/notebooks/LG_M50_ECM/1-single-pulse-circuit-model.ipynb b/examples/notebooks/LG_M50_ECM/1-single-pulse-circuit-model.ipynb
diff --git a/examples/notebooks/comparing_cost_functions.ipynb b/examples/notebooks/comparing_cost_functions.ipynb
diff --git a/examples/notebooks/cost-compute-methods.ipynb b/examples/notebooks/cost-compute-methods.ipynb
@@ -23,7 +23,27 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Note: you may need to restart the kernel to use updated packages.\n",
+      "/Users/engs2510/Documents/Git/PyBOP/.nox/notebooks-overwrite/bin/python3: No module named pip\r\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Note: you may need to restart the kernel to use updated packages.\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "/Users/engs2510/Documents/Git/PyBOP/.nox/notebooks-overwrite/bin/python3: No module named pip\r\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
       "Note: you may need to restart the kernel to use updated packages.\n"
      ]
     }
@@ -356,14 +376,14 @@
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 2
+    "version": 3
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython2",
-   "version": "2.7.6"
+   "pygments_lexer": "ipython3",
+   "version": "3.12.4"
   }
  },
  "nbformat": 4,

diff --git a/examples/notebooks/ecm_trust-constr.ipynb b/examples/notebooks/ecm_trust-constr.ipynb
diff --git a/examples/notebooks/electrode_balancing.ipynb b/examples/notebooks/electrode_balancing.ipynb
diff --git a/examples/notebooks/equivalent_circuit_identification.ipynb b/examples/notebooks/equivalent_circuit_identification.ipynb
diff --git a/examples/notebooks/multi_model_identification.ipynb b/examples/notebooks/multi_model_identification.ipynb
diff --git a/examples/notebooks/multi_optimiser_identification.ipynb b/examples/notebooks/multi_optimiser_identification.ipynb
diff --git a/examples/notebooks/optimiser_calibration.ipynb b/examples/notebooks/optimiser_calibration.ipynb
diff --git a/examples/notebooks/pouch_cell_identification.ipynb b/examples/notebooks/pouch_cell_identification.ipynb
diff --git a/examples/notebooks/solver_selection.ipynb b/examples/notebooks/solver_selection.ipynb
@@ -39,13 +39,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Note: you may need to restart the kernel to use updated packages.\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "Note: you may need to restart the kernel to use updated packages.\n",
       "/Users/engs2510/Documents/Git/PyBOP/.nox/notebooks-overwrite/bin/python3: No module named pip\r\n"
      ]
     },
@@ -194,28 +188,28 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time Evaluate IDA KLU solver: 0.897\n"
+      "Time Evaluate IDA KLU solver: 0.303\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time Evaluate CasADi solver with 'safe' mode: 0.973\n"
+      "Time Evaluate CasADi solver with 'safe' mode: 1.076\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time Evaluate CasADi solver with 'fast' mode: 0.950\n"
+      "Time Evaluate CasADi solver with 'fast' mode: 1.003\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time Evaluate CasADi solver with 'fast with events' mode: 0.823\n"
+      "Time Evaluate CasADi solver with 'fast with events' mode: 1.008\n"
      ]
     }
    ],
@@ -248,28 +242,28 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time EvaluateS1 IDA KLU solver: 1.353\n"
+      "Time EvaluateS1 IDA KLU solver: 0.671\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time EvaluateS1 CasADi solver with 'safe' mode: 3.736\n"
+      "Time EvaluateS1 CasADi solver with 'safe' mode: 4.479\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time EvaluateS1 CasADi solver with 'fast' mode: 3.345\n"
+      "Time EvaluateS1 CasADi solver with 'fast' mode: 3.440\n"
      ]
     },
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Time EvaluateS1 CasADi solver with 'fast with events' mode: 3.307\n"
+      "Time EvaluateS1 CasADi solver with 'fast with events' mode: 3.287\n"
      ]
     }
    ],

diff --git a/examples/notebooks/spm_AdamW.ipynb b/examples/notebooks/spm_AdamW.ipynb
diff --git a/examples/notebooks/spm_electrode_design.ipynb b/examples/notebooks/spm_electrode_design.ipynb