Skip to content

Commit

Permalink
bumpy scipy >= 1.11.0
Browse files Browse the repository at this point in the history
Since 1.11.0, Cartwright's approach (eve="simpson") is the default for Simpson integration, see
https://docs.scipy.org/doc/scipy-1.11.0/reference/generated/scipy.integrate.simpson.html
  • Loading branch information
orbeckst authored Oct 10, 2024
1 parent 28f5dd2 commit 2a06d32
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- python
- six
- numpy
- scipy >=1.6.0
- scipy >=1.11.0
- matplotlib-base
- pandas
- scikit-learn
Expand Down
4 changes: 2 additions & 2 deletions mdpow/fep.py
Original file line number Diff line number Diff line change
Expand Up @@ -1085,8 +1085,8 @@ def analyze(self, force=False, stride=None, autosave=True, ncorrel=25000):
.. versionchanged:: 0.9.0
Change in how the Simpson's rule integration algorithm (namely,
:func:`scipy.integrate.simpson`) handles even number of intervals:
Previously, the old `even="last"` was used but now Cartwright's
approach is always used. This change **leads to numerically
Previously, the old `even="last"` was used but since scipy 1.11.0
Cartwright's approach is used. This change **leads to numerically
slightly different results** between MDPOW 0.9.0 and earlier
versions.
"""
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
install_requires=[
"numpy>=1.6",
"scipy>=1.6.0",
"scipy>=1.11.0",
"pyyaml",
"GromacsWrapper>=0.5.1",
"numkit",
Expand Down

0 comments on commit 2a06d32

Please sign in to comment.