8000 Implement mul, floordiv, mod, divmod, and reversed directly in TimedeltaArray by jbrockmendel · Pull Request #23885 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Implement mul, floordiv, mod, divmod, and reversed directly in TimedeltaArray #23885

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

Merged
merged 16 commits into from
Dec 3, 2018
Merged

Implement mul, floordiv, mod, divmod, and reversed directly in TimedeltaArray #23885

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2f75de9
implement floordiv, rfloordiv, mod, rmod, dimod, rdivmod directly in …
jbrockmendel Nov 23, 2018
749cfed
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 23, 2018
1515e21
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 24, 2018
d7c727c
define __mul__, __rmul__ directly in TimedeltaArray
jbrockmendel Nov 24, 2018
8ae9059
erroy handling
jbrockmendel Nov 24, 2018
2577ee6
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 24, 2018
62d2018
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 24, 2018
8f7b7b4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 28, 2018
6d162d8
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 29, 2018
ef25750
remove no-longer-necessary
jbrockmendel Nov 29, 2018
bc5a3d6
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Nov 29, 2018
700c5a2
update error message
jbrockmendel Nov 29, 2018
d7591b6
remove unused import
jbrockmendel Nov 29, 2018
bdb27ec
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Dec 2, 2018
87f36ac
item_from_zerodim
jbrockmendel Dec 3, 2018
987eecd
Merge branch 'master' of https://github.com/pandas-dev/pandas into ht…
jbrockmendel Dec 3, 2018
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
Prev Previous commit
Next Next commit
item_from_zerodim
  • Loading branch information
@jbrockmendel
jbrockmendel committed Dec 3, 2018
commit 87f36ac71ce0d97ee9340b54bdecd2db54ee9d66
10 changes: 10 additions & 0 deletions pandas/core/arrays/timedeltas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ def __floordiv__(self, other):
if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
return NotImplemented

other = lib.item_from_zerodim(other)
if is_scalar(other):
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)
Expand Down Expand Up @@ -509,6 +510,7 @@ def __rfloordiv__(self, other):
if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
Copy link
Contributor

Choose a reason for hiding this comment

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

can this share with floordiv?

return NotImplemented

other = lib.item_from_zerodim(other)
if is_scalar(other):
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)
Expand Down Expand Up @@ -558,6 +560,8 @@ def __mod__(self, other):
# Note: This is a naive implementation, can likely be optimized
if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
return NotImplemented

other = lib.item_from_zerodim(other)
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)
return self - (self // other) * other
Expand All @@ -566,6 +570,8 @@ def __rmod__(self, other):
# Note: This is a naive implementation, can likely be optimized
if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
return NotImplemented
Copy link
Contributor

Choose a reason for hiding this comment

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

can this share with __mod__?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not really. For div and divmod either timedeltas or numeric are valid. For reversed ops only timedeltas are valid.


other = lib.item_from_zerodim(other)
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)
return other - (other // self) * self
Expand All @@ -574,6 +580,8 @@ def __divmod__(self, other):
# Note: This is a naive implementation, can likely be optimized
if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
return NotImplemented

other = lib.item_from_zerodim(other)
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)

Expand All @@ -585,6 +593,8 @@ def __rdivmod__(self, other):
# Note: This is a naive implementation, can likely be optimized
Copy link
Contributor

Choose a reason for hiding this comment

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

can this share with __divmod__?

if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
return NotImplemented

other = lib.item_from_zerodim(other)
if isinstance(other, (timedelta, np.timedelta64, Tick)):
other = Timedelta(other)

Expand Down
0