Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rsquared with weights #923

Merged
merged 2 commits into from
Nov 8, 2023
Merged

Rsquared with weights #923

merged 2 commits into from
Nov 8, 2023

Conversation

newville
Copy link
Member

@newville newville commented Nov 7, 2023

This fixes #921

Type of Changes
  • Bug fix
  • New feature
  • Refactoring / maintenance
  • Documentation / examples
Tested on

Python: 3.11.5 | packaged by conda-forge | (main, Aug 27 2023, 03:35:23) [Clang 15.0.7 ]
lmfit: 1.2.2.post11+g5a081c5.d20231107, scipy: 1.11.3, numpy: 1.26.0, asteval: 0.9.31, uncertainties: 3.1.7

Verification

Have you

  • included docstrings that follow PEP 257?
  • referenced existing Issue and/or provided relevant link to mailing list?
  • verified that existing tests pass locally?
  • verified that the documentation builds locally?
  • squashed/minimized your commits and written descriptive commit messages?
  • added or updated existing tests to cover the changes?
  • updated the documentation and/or added an entry to the release notes (doc/whatsnew.rst)?
  • added an example?

Copy link

codecov bot commented Nov 7, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c415990) 93.23% compared to head (ccc7755) 93.23%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #923   +/-   ##
=======================================
  Coverage   93.23%   93.23%           
=======================================
  Files          10       10           
  Lines        3697     3697           
=======================================
  Hits         3447     3447           
  Misses        250      250           
Files Coverage Δ
lmfit/model.py 91.25% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@reneeotten reneeotten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, that wasn't really correct indeed.... looks good to me!

@newville
Copy link
Member Author

newville commented Nov 8, 2023

@reneeotten Yeah, that was pretty bad!! I'll merge this. It's been a few months since 1.2.2. It might be good to push out 1.2.3 soonish, but I'm not sure I'll have the time to do that this week and next week will be busier for me, but hopefully by early December.

@newville newville merged commit 4e2470a into master Nov 8, 2023
15 checks passed
@newville newville deleted the rsquared_with_weights branch April 4, 2024 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Model.fit() gives the wrong 'rsquared' when 'weights' is given
2 participants