Merge pull request #293 from pybop-team/288-add-intelligent-eu-projec…

…t-as-funding-contributor Updates README, adds additional notebooks, bugfixes to `model.simulateS1`
pybop-team · Apr 22, 2024 · b5da435 · b5da435
2 parents 57e0e83 + 0273723
commit b5da435
Show file tree

Hide file tree

Showing 18 changed files with 13,706 additions and 2,995 deletions.
diff --git a/README.md b/README.md
diff --git a/assets/PyBOP-high-level.svg b/assets/PyBOP-high-level.svg
diff --git a/assets/logo-farger.pdf b/assets/logo-farger.pdf
diff --git a/assets/logo-farger.svg b/assets/logo-farger.svg
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/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/spm_Adam.ipynb b/examples/notebooks/spm_Adam.ipynb
diff --git a/examples/notebooks/spm_CMAES.ipynb b/examples/notebooks/spm_CMAES.ipynb
diff --git a/examples/notebooks/spm_electrode_design.ipynb b/examples/notebooks/spm_electrode_design.ipynb
diff --git a/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb b/examples/notebooks/spm_scipy_DifferentialEvolution.ipynb
diff --git a/noxfile.py b/noxfile.py
@@ -70,6 +70,7 @@ def notebooks(session):
         "pytest",
         "--notebooks",
         "--nbmake",
+        "--nbmake-timeout=1000",
         "examples/",
     )
 

diff --git a/pybop/_optimisation.py b/pybop/_optimisation.py
@@ -180,15 +180,15 @@ def _run_pybop(self):
         final_cost : float
             The final cost associated with the best parameters.
         """
-        result = self.optimiser.optimise(
+        self.result = self.optimiser.optimise(
             cost_function=self.cost,
             x0=self.x0,
             maxiter=self._max_iterations,
         )
         self.log = self.optimiser.log
-        self._iterations = result.nit
+        self._iterations = self.result.nit
 
-        return result.x, self.cost(result.x)
+        return self.result.x, self.cost(self.result.x)
 
     def _run_pints(self):
         """

diff --git a/pybop/models/base_model.py b/pybop/models/base_model.py
@@ -439,7 +439,7 @@ def simulateS1(self, inputs, t_eval):
                     return y, dy
                 except Exception as e:
                     print(f"Error: {e}")
-                    return [np.inf], [np.inf]
+                    return {signal: [np.inf] for signal in self.signal}, [np.inf]
 
             else:
                 return {signal: [np.inf] for signal in self.signal}, [np.inf]

diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py
@@ -267,7 +267,7 @@ def test_non_converged_solution(self):
 
         problem = pybop.FittingProblem(model, parameters=parameters, dataset=dataset)
         res = problem.evaluate([-0.2, -0.2])
-        res_grad = problem.evaluateS1([-0.2, -0.2])
+        _, res_grad = problem.evaluateS1([-0.2, -0.2])
 
         assert np.isinf(res).any()
         assert np.isinf(res_grad).any()