Draft
Conversation
Resolved conflicts in fitting minimizers and their tests. Decisions: - minimizer_bumps.py: kept interim's monitor-based architecture (with progress_callback support) and discarded develop's _EvalCounter / bumps_fit() approach. Ported develop's user-facing UserWarning emission into interim's max_evaluations failure branch. - minimizer_dfo.py: kept interim's restructured exception handling (_restore_parameter_values helper) and broader warning policy (warn on any non-success). Kept develop's explanatory comments about EXIT_SUCCESS / EXIT_MAXFUN_WARNING. - minimizer_lmfit.py: kept develop's UserWarning emission on failed fit with a message. - utils.py: kept interim's more descriptive 'Chi2 or reduced chi2 is not finite' ValueError; FitResults additions (n_evaluations, message, __repr__, reduced_chi2 rename) are common to both branches. - test_minimizer_bumps.py / test_minimizer_dfo.py: kept interim's tests verbatim (develop's new tests targeted develop's removed _EvalCounter architecture). - test_fitter.py: dropped develop-only test_bumps_max_evaluations_counts_objective_calls (asserts message format from develop's implementation). - test_minimizer_lmfit.py / test_utils.py: accepted develop's additions (no architectural conflict). Full test suite: 1251 passed, 1 skipped (baseline was 1237 passed).
rozyczko
added
[scope] maintenance
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## interim_updates #235 +/- ##
===================================================
- Coverage 85.70% 84.79% -0.92%
===================================================
Files 52 52
Lines 4631 4636 +5
===================================================
- Hits 3969 3931 -38
- Misses 662 705 +43
Flags with carried forward coverage won't be shown. Click here to find out more.
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Attempt at merging develop into interim