minimizer consolidation #45
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
Aug 6, 2024
| parameters[parameter_name] = item.raw_value | ||
| return parameters | ||
|
|
||
| def _generate_fit_function(self) -> Callable: |
There was a problem hiding this comment.
fetched from bumps / dfo
andped10
commented
Aug 6, 2024
| return _fit_function | ||
|
|
||
| @staticmethod | ||
| def _create_signature(parameters: Dict[int, Parameter]) -> Signature: |
There was a problem hiding this comment.
fetched from bumps / lmfit
andped10
commented
Aug 6, 2024
|
|
||
| lm_fit_function.__signature__ = self._wrap_to_lm_signature(self._cached_pars) | ||
| return lm_fit_function | ||
| def available_methods(self) -> List[str]: |
There was a problem hiding this comment.
public method moved to top
andped10
commented
Aug 6, 2024
| """ | ||
| super().__init__(obj=obj, fit_function=fit_function, method=method) | ||
|
|
||
| def _make_model(self, pars: Optional[LMParameters] = None) -> LMModel: |
There was a problem hiding this comment.
private method moved down
andped10
commented
Aug 6, 2024
| assert str(domain_fit_results.minimizer_engine) == "<class 'easyscience.fitting.minimizers.minimizer_lmfit.LMFit'>" | ||
| assert domain_fit_results.fit_args is None | ||
|
|
||
| def test_wrap_to_lm_signature(self, minimizer: LMFit) -> None: |
There was a problem hiding this comment.
now tested in minimizer_base
andped10
commented
Aug 6, 2024
| ] | ||
|
|
||
| @staticmethod | ||
| def _wrap_to_lm_signature(parameters: Dict[int, Parameter]) -> Signature: |
There was a problem hiding this comment.
now in minimizer_base
andped10
commented
Aug 6, 2024
| assert mock_lm_model.set_param_hint.call_count == 2 | ||
| assert model == mock_lm_model | ||
|
|
||
| def test_generate_fit_function_signatur(self, minimizer: LMFit) -> None: |
There was a problem hiding this comment.
now tested in minimizer_base
rozyczko
reviewed
Aug 7, 2024
rozyczko
approved these changes
Aug 7, 2024
rozyczko
added a commit
to rozyczko/EasyScience
that referenced
this pull request
Aug 15, 2024
PR related fixes ruff, be quiet. renamed Job->job directory name 38 add tests for minimizer bumps (easyscience#41) * tests and adjustments * handling circular dependency * Updated minimizer names * Made ruff happy * pr response * more consistent usage of enum --------- Co-authored-by: henrikjacobsenfys <henrik.jacobsen.fys@gmail.com> removed unnecessary empty line minimizer consolidation (easyscience#45) * minimizer consolidation * pr response
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Moved duplicated functionality to base class.
Tests are moved to module for base class.
minimizer_lmfitmoved public methods to the top of the file.