fix: cuckoo boundaries==None clipping, add missing cuckoo to unit opt…

…imisation tests, updt. integration tests
pybop-team · BradyPlanden · Jul 5, 2024 · May 9, 2024 · May 23, 2024 · May 23, 2024
commit aa94180c426e0a89a1761ac2e9f7226837e51ff2
diff --git a/pybop/costs/_likelihoods.py b/pybop/costs/_likelihoods.py
@@ -265,7 +265,7 @@ class MAP(BaseLikelihood):
 
     """
 
-    def __init__(self, problem, likelihood, sigma0=None, gradient_step=1e-2):
+    def __init__(self, problem, likelihood, sigma0=None, gradient_step=1e-3):
         super(MAP, self).__init__(problem)
         self.sigma0 = sigma0
         self.gradient_step = gradient_step

diff --git a/pybop/optimisers/_cuckoo.py b/pybop/optimisers/_cuckoo.py
@@ -71,7 +71,9 @@ def __init__(self, x0, sigma0=0.01, boundaries=None, pa=0.25):
                 size=(self._n, self._dim),
             )
         else:
-            self._nests = np.random.normal(self._x0, self._sigma0)
+            self._nests = np.random.normal(
+                self._x0, self._sigma0, size=(self._n, self._dim)
+            )
 
         self._fitness = np.full(self._n, np.inf)
 

diff --git a/tests/integration/test_spm_parameterisations.py b/tests/integration/test_spm_parameterisations.py
@@ -109,7 +109,7 @@ def test_spm_optimisers(self, optimiser, spm_costs):
             )
 
         # Set sigma0 and create optimiser
-        sigma0 = 0.01 if isinstance(spm_costs, pybop.GaussianLogLikelihood) else 0.05
+        sigma0 = 0.006 if isinstance(spm_costs, pybop.MAP) else None
         optim = optimiser(sigma0=sigma0, **common_args)
 
         # Set max unchanged iterations for BasePintsOptimisers

diff --git a/tests/unit/test_optimisation.py b/tests/unit/test_optimisation.py
@@ -127,6 +127,7 @@ def test_no_optimisation_parameters(self, model, dataset):
             pybop.PSO,
             pybop.IRPropMin,
             pybop.NelderMead,
+            pybop.CuckooSearch,
         ],
     )
     @pytest.mark.unit
@@ -265,17 +266,10 @@ def test_optimiser_kwargs(self, cost, optimiser):
             assert optim.x0 != x0
 
     @pytest.mark.unit
-    def test_cuckoo_no_bounds(self, dataset, model):
-        parameter = pybop.Parameter(
-            "Negative electrode active material volume fraction",
-            prior=pybop.Gaussian(0.6, 0.2),
-        )
-
-        cost_no_bounds = pybop.SumSquaredError(
-            pybop.FittingProblem(model, parameter, dataset)
-        )
-        optim = pybop.CuckooSearch(cost=cost_no_bounds, max_iterations=1)
+    def test_cuckoo_no_bounds(self, dataset, cost, model):
+        optim = pybop.CuckooSearch(cost=cost, bounds=None, max_iterations=1)
         optim.run()
+        assert optim.pints_optimiser._boundaries is None
 
     @pytest.mark.unit
     def test_scipy_minimize_with_jac(self, cost):