Skip to content

Commit a0a3b38

Browse files
committed
MAINT: rename AkimaInterpolator to Akima1DInterpolator
1 parent 2bda1f4 commit a0a3b38

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

doc/release/0.14.0-notes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ If performance is critical, sorting can be turned off by using the new
3636
Functionality for evaluation of bivariate spline derivatives in
3737
``scipy.interpolate`` has been added.
3838

39-
The new class `scipy.interpolate.AkimaInterpolator` implements the piecewise
39+
The new class `scipy.interpolate.Akima1DInterpolator` implements the piecewise
4040
cubic polynomial interpolation scheme devised by H. Akima.
4141

4242
``scipy.linalg`` improvements

scipy/interpolate/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
krogh_interpolate
2929
piecewise_polynomial_interpolate
3030
pchip_interpolate
31-
AkimaInterpolator
31+
Akima1DInterpolator
3232
PPoly
3333
BPoly
3434

scipy/interpolate/_monotone.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
__all__ = ["PchipInterpolator", "pchip_interpolate", "pchip",
10-
"AkimaInterpolator"]
10+
"Akima1DInterpolator"]
1111

1212

1313
class PchipInterpolator(object):
@@ -229,7 +229,7 @@ def pchip_interpolate(xi, yi, x, der=0, axis=0):
229229
pchip = PchipInterpolator
230230

231231

232-
class AkimaInterpolator(PPoly):
232+
class Akima1DInterpolator(PPoly):
233233
"""
234234
Akima interpolator
235235
@@ -317,7 +317,7 @@ def __init__(self, x, y):
317317
coeff[1] = c
318318
coeff[0] = d
319319

320-
super(AkimaInterpolator, self).__init__(coeff, x, extrapolate=False)
320+
super(Akima1DInterpolator, self).__init__(coeff, x, extrapolate=False)
321321

322322
def extend(self):
323323
raise NotImplementedError("Extending a 1D Akima interpolator is not "

scipy/interpolate/tests/test_interpolate.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from scipy.lib._version import NumpyVersion
1313

1414
from scipy.interpolate import (interp1d, interp2d, lagrange, PPoly, BPoly,
15-
ppform, splrep, splev, splantider, splint, sproot, AkimaInterpolator)
15+
ppform, splrep, splev, splantider, splint, sproot, Akima1DInterpolator)
1616

1717
from scipy.interpolate import _ppoly
1818

@@ -349,11 +349,11 @@ def test_lagrange(self):
349349
assert_array_almost_equal(p.coeffs,pl.coeffs)
350350

351351

352-
class TestAkimaInterpolator(TestCase):
352+
class TestAkima1DInterpolator(TestCase):
353353
def test_eval(self):
354354
x = np.arange(0., 11.)
355355
y = np.array([0., 2., 1., 3., 2., 6., 5.5, 5.5, 2.7, 5.1, 3.])
356-
ak = AkimaInterpolator(x, y)
356+
ak = Akima1DInterpolator(x, y)
357357
xi = np.array([0., 0.5, 1., 1.5, 2.5, 3.5, 4.5, 5.1, 6.5, 7.2,
358358
8.6, 9.9, 10.])
359359
yi = np.array([0., 1.375, 2., 1.5, 1.953125, 2.484375,
@@ -367,7 +367,7 @@ def test_eval_2d(self):
367367
x = np.arange(0., 11.)
368368
y = np.array([0., 2., 1., 3., 2., 6., 5.5, 5.5, 2.7, 5.1, 3.])
369369
y = np.column_stack((y, 2. * y))
370-
ak = AkimaInterpolator(x, y)
370+
ak = Akima1DInterpolator(x, y)
371371
xi = np.array([0., 0.5, 1., 1.5, 2.5, 3.5, 4.5, 5.1, 6.5, 7.2,
372372
8.6, 9.9, 10.])
373373
yi = np.array([0., 1.375, 2., 1.5, 1.953125, 2.484375,
@@ -388,7 +388,7 @@ def test_eval_3d(self):
388388
y[:, 1, 0] = 2. * y_
389389
y[:, 0, 1] = 3. * y_
390390
y[:, 1, 1] = 4. * y_
391-
ak = AkimaInterpolator(x, y)
391+
ak = Akima1DInterpolator(x, y)
392392
xi = np.array([0., 0.5, 1., 1.5, 2.5, 3.5, 4.5, 5.1, 6.5, 7.2,
393393
8.6, 9.9, 10.])
394394
yi = np.empty((13, 2, 2))
@@ -408,7 +408,7 @@ def test_eval_3d(self):
408408
def test_extend(self):
409409
x = np.arange(0., 11.)
410410
y = np.array([0., 2., 1., 3., 2., 6., 5.5, 5.5, 2.7, 5.1, 3.])
411-
ak = AkimaInterpolator(x, y)
411+
ak = Akima1DInterpolator(x, y)
412412
try:
413413
ak.extend()
414414
except NotImplementedError as e:

0 commit comments

Comments
 (0)