From 7e3d787bad85be51c0cbf8edaf320dc81fbb5c56 Mon Sep 17 00:00:00 2001 From: Brady Planden Date: Fri, 6 Sep 2024 16:55:34 +0100 Subject: [PATCH] Merge branch 'refs/heads/develop' into 410-bug-incorrect-axis-symbol-rendering-formu-in-notebooks --- .../1-single-pulse-circuit-model.ipynb | 38 +- .../notebooks/comparing_cost_functions.ipynb | 205 +- examples/notebooks/cost-compute-methods.ipynb | 28 +- examples/notebooks/ecm_trust-constr.ipynb | 16 +- examples/notebooks/electrode_balancing.ipynb | 22 +- .../equivalent_circuit_identification.ipynb | 20 +- .../multi_model_identification.ipynb | 2304 +---------------- .../multi_optimiser_identification.ipynb | 176 +- .../notebooks/optimiser_calibration.ipynb | 104 +- .../notebooks/pouch_cell_identification.ipynb | 33 +- examples/notebooks/solver_selection.ipynb | 24 +- examples/notebooks/spm_AdamW.ipynb | 20 +- examples/notebooks/spm_electrode_design.ipynb | 8 +- 13 files changed, 600 insertions(+), 2398 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 index 831325fd..91b44943 100644 --- a/examples/notebooks/LG_M50_ECM/1-single-pulse-circuit-model.ipynb +++ b/examples/notebooks/LG_M50_ECM/1-single-pulse-circuit-model.ipynb @@ -32,7 +32,13 @@ "name": "stdout", "output_type": "stream", "text": [ - "Note: you may need to restart the kernel to use updated packages.\n", + "Note: you may need to restart the kernel to use updated packages.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ "zsh:1: no matches found: pybop[plot]\r\n" ] }, @@ -204,9 +210,9 @@ { "data": { "text/html": [ - "
\n", + " " + ] + }, + "metadata": {}, + "output_type": "display_data" + }, + { + "data": { + "text/html": [ + "
" ] }, "metadata": {}, @@ -342,8 +419,32 @@ "outputs": [ { "data": { - "image/svg+xml": [ - "4.8μ5μ5.2μ5.4μ5.6μ00.050.10.150.20.25RMSE*Nsqrt(SSE)Minkowski" + "text/html": [ + "
" ] }, "metadata": {}, @@ -407,8 +508,32 @@ "outputs": [ { "data": { - "image/svg+xml": [ - "4.8μ5μ5.2μ5.4μ5.6μ00.10.20.30.40.50.60.7Minkowski 0.75Minkowski 1.0Minkowski 1.5Minkowski 2.0Minkowski 2.5Minkowski 3.0" + "text/html": [ + "
" ] }, "metadata": {}, @@ -460,8 +585,32 @@ "outputs": [ { "data": { - "image/svg+xml": [ - "4.8μ5μ5.2μ5.4μ5.6μ00.050.10.150.20.25RMSE*NSSESum of Power" + "text/html": [ + "
" ] }, "metadata": {}, @@ -534,8 +683,32 @@ "outputs": [ { "data": { - "image/svg+xml": [ - "4.8μ5μ5.2μ5.4μ5.6μ00.511.522.5Minkowski 0.75Sum of Power 0.75Minkowski 1.0Sum of Power 1.0Minkowski 2.0Sum of Power 2.0" + "text/html": [ + "
" ] }, "metadata": {}, @@ -587,7 +760,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.9" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/examples/notebooks/cost-compute-methods.ipynb b/examples/notebooks/cost-compute-methods.ipynb index fc494741..db7e8d5e 100644 --- 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 index 2e9267d6..222e4ebf 100644 --- a/examples/notebooks/ecm_trust-constr.ipynb +++ b/examples/notebooks/ecm_trust-constr.ipynb @@ -272,9 +272,9 @@ { "data": { "text/html": [ - "
" ] }, "metadata": {}, @@ -2588,8 +498,32 @@ }, { "data": { - "image/svg+xml": [ - "050010001500200025002.833.23.43.6ReferenceModelSingle Particle Model with ElectrolyteTime / sVoltage / V" + "text/html": [ + "
" ] }, "metadata": {}, @@ -2628,8 +562,32 @@ "outputs": [ { "data": { - "image/svg+xml": [ - "65μ70μ75μ80μ85μ75μ80μ85μ90μ95μ102030405060Single Particle ModelPositive electrode thickness [m]Negative electrode thickness [m]" + "text/html": [ + "
" ] }, "metadata": {}, @@ -2637,8 +595,32 @@ }, { "data": { - "image/svg+xml": [ - "65μ70μ75μ80μ85μ75μ80μ85μ90μ95μ10203040506070Single Particle Model with ElectrolytePositive electrode thickness [m]Negative electrode thickness [m]" + "text/html": [ + "
" ] }, "metadata": {}, @@ -2670,7 +652,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.12" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/examples/notebooks/multi_optimiser_identification.ipynb b/examples/notebooks/multi_optimiser_identification.ipynb index 0f233499..aed9b06c 100644 --- a/examples/notebooks/multi_optimiser_identification.ipynb +++ b/examples/notebooks/multi_optimiser_identification.ipynb @@ -535,9 +535,9 @@ { "data": { "text/html": [ - "