Tests for DFO minimizer #40
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
andped10
commented
Jul 30, 2024
| @@ -59,21 +57,6 @@ def add_fit_constraint(self, constraint: ObjConstraint): | |||
| def remove_fit_constraint(self, index: int) -> None: | |||
| del self._constraints[index] | |||
|
|
|||
| @abstractmethod | |||
andped10
commented
Jul 30, 2024
| @@ -129,26 +112,6 @@ def evaluate(self, x: np.ndarray, minimizer_parameters: dict[str, float] = None, | |||
|
|
|||
| return self._fit_function(x, **minimizer_parameters, **kwargs) | |||
|
|
|||
| def _prepare_parameters(self, parameters: dict[str, float]) -> dict[str, float]: | |||
andped10
commented
Jul 30, 2024
| """ | ||
| Convert an `EasyScience.Objects.Base.Parameter` object to an engine Parameter object. | ||
| """ | ||
|
|
||
| @abstractmethod |
andped10
commented
Jul 30, 2024
|
|
||
| @abstractmethod |
andped10
commented
Jul 30, 2024
| @@ -37,108 +40,8 @@ def __init__(self, obj, fit_function: Callable, method: Optional[str] = None): | |||
| super().__init__(obj=obj, fit_function=fit_function, method=method) | |||
| self._p_0 = {} | |||
|
|
|||
| def make_model(self, pars: Optional[List] = None) -> Callable: | |||
andped10
commented
Jul 30, 2024
| pars = self._cached_pars | ||
| item = {} | ||
| for p_name, par in pars.items(): | ||
|
|
There was a problem hiding this comment.
used more meaningful names
andped10
commented
Jul 30, 2024
| @@ -291,10 +292,8 @@ def _gen_fit_results(self, fit_results, weights, **kwargs) -> FitResults: | |||
|
|
|||
| return results | |||
|
|
|||
| def available_methods(self) -> List[str]: | |||
andped10
commented
Jul 30, 2024
| return ['leastsq'] | ||
|
|
||
| def dfols_fit(self, model: Callable, **kwargs): | ||
| @staticmethod |
There was a problem hiding this comment.
Made a static method where pars are now passed
andped10
commented
Jul 30, 2024
| InspectParameter.POSITIONAL_OR_KEYWORD, | ||
| annotation=_empty, | ||
| default=default_value, | ||
| @staticmethod |
There was a problem hiding this comment.
Made a static method since its functionality only makes sense for the class
rozyczko
approved these changes
Jul 30, 2024
rozyczko
pushed a commit
to rozyczko/EasyScience
that referenced
this pull request
Aug 15, 2024
* first tests and adjustments * test and changes from public to private methods * all tests * fix tests * PR response * typing and test * revert to prevent circular import * init file corrected * code cleaning
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added test for DFO minimizer:
Cleaned up
minimizer_base.py_prepare_parametersis just movedCleaned up
minimizer_dfo.py