Fix tests due to function name changes

kliff/calculators/calculator.py

@@ -251,12 +251,12 @@ def get_num_opt_params(self) -> int:
         """
         return self.model.get_num_opt_params()
 
-    def has_opt_params_bounds(self):
+    def opt_params_has_bounds(self):
         """
         Return a bool to indicate whether there are parameters whose bounds are
         provided.
         """
-        return self.model.has_opt_params_bounds()
+        return self.model.opt_params_has_bounds()
 
     def get_opt_params_bounds(self):
         """
@@ -267,7 +267,7 @@ def get_opt_params_bounds(self):
         :meth:`get_opt_params`. ``None`` for ``lower`` or ``upper`` means that no bound
         should be applied.
         """
-        return self.model.get_opt_params_bounds()
+        return self.model.get_formatted_param_bounds()
 
     def update_model_params(self, opt_params: List[float]):
         """
@@ -373,7 +373,7 @@ def get_calculator_list(self):
             calc_list.extend([calc] * N)
         return calc_list
 
-    def has_opt_params_bounds(self) -> bool:
+    def opt_params_has_bounds(self) -> bool:
         """
         Return a boolean to indicate whether there are parameters whose bounds are
         provided.
@@ -383,7 +383,7 @@ def has_opt_params_bounds(self) -> bool:
         """
         calc_list = self._calculators
         has_opt_params_bounds_per_calc = [
-            calc.model.has_opt_params_bounds() for calc in calc_list
+            calc.model.opt_params_has_bounds() for calc in calc_list
         ]
         return all(has_opt_params_bounds_per_calc)
 

kliff/loss.py

@@ -331,7 +331,7 @@ def _adjust_kwargs(self, method, **kwargs):
                     )
 
             # adjust bounds
-            if self.calculator.has_opt_params_bounds():
+            if self.calculator.opt_params_has_bounds():
                 if method in ["trf", "dogbox"]:
                     bounds = self.calculator.get_opt_params_bounds()
                     lb = [b[0] if b[0] is not None else -np.inf for b in bounds]
@@ -356,7 +356,7 @@ def _adjust_kwargs(self, method, **kwargs):
             else:
                 calculators = [self.calculator]
             for calc in calculators:
-                if calc.has_opt_params_bounds():
+                if calc.opt_params_has_bounds():
                     if method in ["L-BFGS-B", "TNC", "SLSQP"]:
                         bounds = self.calculator.get_opt_params_bounds()
                         kwargs["bounds"] = bounds

tests/models/test_parameter.py

@@ -151,7 +151,7 @@ def create_all_possible_input(v):
 #
 #     bounds = [[i - 0.1, i + 0.1] for i in x0]
 #     assert np.array_equal(op.get_opt_params_bounds(), bounds)
-#     assert op.has_opt_params_bounds() == True
+#     assert op.opt_params_has_bounds() == True
 #
 #     import sys
 #