Skip to content

Commit

Permalink
updates for scipy 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
dlakaplan committed Jun 26, 2024
1 parent 224e5f1 commit 270068e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ the released changes.
- The following observatories no longer have a default of `include_bipm=False`: magic, lst, virgo, lho, llo, geo600, kagra, hess, hawc
- New algorithm for TCB <-> TDB conversion
- Reordered plotting axes in `pintk`
- Changed `scipy.integrate.simps` to `scipy.integrate.simpson` to work with scipy 1.14
### Added
- `bayesian_information_criterion()` function
- `dmx_setup` function
Expand Down
4 changes: 2 additions & 2 deletions src/pint/templates/lcprimitives.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from math import atan, cosh, tan

import numpy as np
from scipy.integrate import quad, simps
from scipy.integrate import quad, simpson
from scipy.interpolate import interp1d
from scipy.special import erf, i0, i1, owens_t
from scipy.stats import cauchy, norm, vonmises, skewnorm
Expand Down Expand Up @@ -1593,7 +1593,7 @@ def integrate(self, x1=0, x2=1):
x = self.interpolator.x
y = self.interpolator.y
mask = (x >= x1) & (x <= x2)
return simps(y[mask], x=x[mask])
return simpson(y[mask], x=x[mask])
# return self.interpolator.y[mask].sum()/len(mask)


Expand Down

0 comments on commit 270068e

Please sign in to comment.