expose minimizer enum

Author: andped10

src/easyscience/fitting/fitter.py

@@ -26,13 +26,13 @@ class Fitter:
     def __init__(self, fit_object, fit_function: Callable):
         self._fit_object = fit_object
         self._fit_function = fit_function
-        self._dependent_dims = None
-        self._tolerance = None
-        self._max_evaluations = None
+        self._dependent_dims: int = None
+        self._tolerance: float = None
+        self._max_evaluations: int = None
 
-        self._enum_current_minimizer = DEFAULT_MINIMIZER
-        self._minimizer: MinimizerBase  # _minimizer is set in the create method
-        self._update_minimizer(self._enum_current_minimizer)
+        self._minimizer: MinimizerBase = None  # set in _update_minimizer
+        self._enum_current_minimizer: AvailableMinimizers = None  # set in _update_minimizer
+        self._update_minimizer(DEFAULT_MINIMIZER)
 
     def fit_constraints(self) -> list:
         return self._minimizer.fit_constraints()

src/easyscience/fitting/minimizers/minimizer_base.py

@@ -40,7 +40,7 @@ def __init__(
         self,
         obj,  #: BaseObj,
         fit_function: Callable,
-        minimizer_enum: Optional[AvailableMinimizers] = None,
+        minimizer_enum: AvailableMinimizers,
     ):  # todo after constraint changes, add type hint: obj: BaseObj  # noqa: E501
         if minimizer_enum.method not in self.supported_methods():
             raise FitError(f'Method {minimizer_enum.method} not available in {self.__class__}')
@@ -58,6 +58,10 @@ def __init__(
     def all_constraints(self) -> List[ObjConstraint]:
         return [*self._constraints, *self._object._constraints]
 
+    @property
+    def enum(self) -> AvailableMinimizers:
+        return self._minimizer_enum
+
     @property
     def name(self) -> str:
         return self._minimizer_enum.name

tests/unit_tests/Fitting/minimizers/test_minimizer_base.py

@@ -17,10 +17,11 @@ def minimizer(self):
         MinimizerBase.__abstractmethods__ = set()
         MinimizerBase.supported_methods = MagicMock(return_value=['method'])
 
+        self._mock_minimizer_enum = MagicMock(package='package', method='method') 
         minimizer = MinimizerBase(
             obj='obj',
             fit_function='fit_function',
-            minimizer_enum=MagicMock(package='package', method='method')
+            minimizer_enum=self._mock_minimizer_enum
         )
         return minimizer
 
@@ -47,6 +48,9 @@ def test_init(self, minimizer: MinimizerBase):
         assert minimizer._fit_function == None
         assert minimizer._constraints == []
 
+    def test_enum(self, minimizer: MinimizerBase):
+        assert minimizer.enum == self._mock_minimizer_enum
+
     def test_evaluate(self, minimizer: MinimizerBase):
         # When
         minimizer._fit_function = MagicMock(return_value='fit_function_return')

tests/unit_tests/Fitting/test_fitter.py

@@ -20,7 +20,8 @@ def test_constructor(self, fitter: Fitter):
         assert fitter._fit_object == self.mock_fit_object
         assert fitter._fit_function == self.mock_fit_function
         assert fitter._dependent_dims is None
-        assert fitter._enum_current_minimizer == AvailableMinimizers.LMFit_leastsq
+        assert fitter._enum_current_minimizer is None #== AvailableMinimizers.LMFit_leastsq
+        assert fitter._minimizer is None
         fitter._update_minimizer.assert_called_once_with(AvailableMinimizers.LMFit_leastsq)
 
     def test_fit_constraints(self, fitter: Fitter):