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

Add dual_annealing algorithm #556

Merged
merged 3 commits into from
May 22, 2019
Merged

Conversation

reneeotten
Copy link
Contributor

Description

This PR adds the ``dual_annealingalgorithm that was introduced inscipy``` v1.2 (see Issue #527)

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

Python: 3.7.3 (default, Mar 31 2019, 14:30:14)
[Clang 10.0.1 (clang-1001.0.46.3)]

lmfit: 0.9.13+29.g63369d3, scipy: 1.2.1, numpy: 1.16.3, asteval: 0.9.13, uncertainties: 3.0.3, six: 1.12.0

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?
  • squashed/minimized your commits and written descriptive commit messages?
  • added or updated existing tests to cover the changes?
  • updated the documentation?
  • added an example?

@codecov
Copy link

codecov bot commented May 19, 2019

Codecov Report

Merging #556 into master will increase coverage by 0.03%.
The diff coverage is 88.57%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #556      +/-   ##
==========================================
+ Coverage   84.68%   84.72%   +0.03%     
==========================================
  Files          11       11              
  Lines        3213     3247      +34     
==========================================
+ Hits         2721     2751      +30     
- Misses        492      496       +4
Impacted Files Coverage Δ
lmfit/minimizer.py 90.14% <88.57%> (-0.09%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76537d1...63369d3. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented May 19, 2019

Codecov Report

Merging #556 into master will increase coverage by 0.03%.
The diff coverage is 88.57%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #556      +/-   ##
==========================================
+ Coverage   84.68%   84.72%   +0.03%     
==========================================
  Files          11       11              
  Lines        3213     3247      +34     
==========================================
+ Hits         2721     2751      +30     
- Misses        492      496       +4
Impacted Files Coverage Δ
lmfit/minimizer.py 90.14% <88.57%> (-0.09%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76537d1...63369d3. Read the comment docs.

except ImportError:
HAS_SHGO = False
HAS_DUAL_ANNEALING = False
Copy link
Member

Choose a reason for hiding this comment

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

should these two imports be grouped together? If either import fails, neither will be available. I thought they were introduced in different versions of scipy.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

both algorithms were added in scipy v1.2.0 so, yes, the grouping is intentional

Copy link
Member

Choose a reason for hiding this comment

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

Oh, OK. Thanks!

@newville
Copy link
Member

@reneeotten Looks Great! I had one small comment/question, but let me know if/when you think this is ready to merge.

@newville
Copy link
Member

@reneeotten Let me know if this is ready to merge... Looks great to me!

@reneeotten
Copy link
Contributor Author

it should be good to go as far as I am concerned so I'll merge it.

@reneeotten reneeotten merged commit ca4f853 into lmfit:master May 22, 2019
@reneeotten reneeotten deleted the dual_annealing branch May 22, 2019 15:35
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.

2 participants