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.

Sign up for GitHub

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

ENH: add timedelta as valid type for interpolate with method='time' #14799

Merged
merged 9 commits into from
Dec 10, 2016
Merged

ENH: add timedelta as valid type for interpolate with method='time' #14799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d87273d
added timedelta as valid type for conversion to integer
aileronajay Dec 5, 2016
822f55e
added test case for change
aileronajay Dec 6, 2016
81dab58
updated test with correct issue number and timedelta as index
aileronajay Dec 6, 2016
18b756c
checking if index is of time type using needs_i8_conversion
aileronajay Dec 7, 2016
95722ff
code review changes
aileronajay Dec 7, 2016
579c4bb
rebase changes
aileronajay Dec 9, 2016
b72ab91
whatsnew changes
aileronajay Dec 9, 2016
fff59f5
whatsnew message typos
aileronajay Dec 9, 2016
562a793
edit whatsnew line
jorisvandenbossche Dec 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.20.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Other enhancements
- ``Series`` provides a ``to_excel`` method to output Excel files (:issue:`8825`)
- The ``usecols`` argument in ``pd.read_csv`` now accepts a callable function as a value (:issue:`14154`)
- ``pd.DataFrame.plot`` now prints a title above each subplot if ``suplots=True`` and ``title`` is a list of strings (:issue:`14753`)
- ``pd.Series.interpolate`` now supports timedelta as an index type with ``method='time'`` (:issue:`6424`)

.. _whatsnew_0200.api_breaking:

Expand Down
5 changes: 3 additions & 2 deletions pandas/core/missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
is_float_dtype, is_datetime64_dtype,
is_integer_dtype, _ensure_float64,
is_scalar,
_DATELIKE_DTYPES)
_DATELIKE_DTYPES,
needs_i8_conversion)
from pandas.types.missing import isnull


Expand Down Expand Up @@ -187,7 +188,7 @@ def _interp_limit(invalid, fw_limit, bw_limit):
if method in ('values', 'index'):
inds = np.asarray(xvalues)
# hack for DatetimeIndex, #1646
if issubclass(inds.dtype.type, np.datetime64):
if needs_i8_conversion(inds.dtype.type):
inds = inds.view(np.int64)
if inds.dtype == np.object_:
inds = lib.maybe_convert_objects(inds)
Expand Down
17 changes: 17 additions & 0 deletions pandas/tests/series/test_missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,23 @@ def test_spline_error(self):
with tm.assertRaises(ValueError):
s.interpolate(method='spline', order=0)

def test_interp_timedelta64(self):
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add another test with non-uniform spacing in the index. e.g. pd.to_timedelta([1, 2, 4]) and ensure that it gets interpolated to the correct value.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, would it be better if i add it as one more in the existing test or as a new test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@TomAugspurger i have added non uniform spacing as a test case now

# GH 6424
df = Series([1, np.nan, 3],
index=pd.to_timedelta([1, 2, 3]))
result = df.interpolate(method='time')
expected = Series([1., 2., 3.],
index=pd.to_timedelta([1, 2, 3]))
assert_series_equal(result, expected)

# test for non uniform spacing
df = Series([1, np.nan, 3],
index=pd.to_timedelta([1, 2, 4]))
result = df.interpolate(method='time')
expected = Series([1., 1.666667, 3.],
index=pd.to_timedelta([1, 2, 4]))
assert_series_equal(result, expected)


if __name__ == '__main__':
import nose
Expand Down