add R^2 statistic for Model #810
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #810 +/- ##
=======================================
Coverage 93.87% 93.88%
=======================================
Files 10 9 -1
Lines 3480 3481 +1
=======================================
+ Hits 3267 3268 +1
Misses 213 213
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
reneeotten
reviewed
Oct 18, 2022
lmfit/model.py
Outdated
| if self.data is not None and len(self.data) > 1: | ||
| sstot = max(tiny, ((self.data - self.data.mean())**2).sum()) | ||
| if isinstance(self.residual, np.ndarray) and len(self.residual) > 1: | ||
| self.rsquared = 1.0 - (self.residual**2).sum() / sstot |
There was a problem hiding this comment.
for readability I would prefer the max(tiny, .....) to be in the line above instead of the sstot define, but that might be a personal preference
There was a problem hiding this comment.
@reneeotten Yeah, I agree. I think I was fighting line length considerations, but readability is not only line length ;)
| @@ -137,6 +137,8 @@ def fit_report(inpars, modelpars=None, show_correl=True, min_correl=0.1, | |||
| add(f" reduced chi-square = {getfloat_attr(result, 'redchi')}") | |||
| add(f" Akaike info crit = {getfloat_attr(result, 'aic')}") | |||
| add(f" Bayesian info crit = {getfloat_attr(result, 'bic')}") | |||
| if hasattr(result, 'rsquared'): | |||
| add(f" R-squared = {getfloat_attr(result, 'rsquared')}") | |||
There was a problem hiding this comment.
we should probably also add this to fitreport_html_table?
There was a problem hiding this comment.
Ah, thanks, I forgot. Will add.
reneeotten
approved these changes
Oct 22, 2022
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.
Adds R^2 statistic for Model fits, as discussed in #803.
Description
Type of Changes
Tested on
Verification
Have you