CLN: Cleanup ops.py #13605
Closed
CLN: Cleanup ops.py #13605
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sinhrks
added
Numeric Operations
Current coverage is 84.33%@@ master #13605 diff @@
==========================================
Files 138 138
Lines 51100 51092 -8
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
- Hits 43097 43090 -7
+ Misses 8003 8002 -1
Partials 0 0
|
2 tasks
| @@ -264,7 +263,57 @@ def add_flex_arithmetic_methods(cls, flex_arith_method, radd_func=None, | |||
| exclude=exclude) | |||
|
|
|||
|
|
|||
| class _TimeOp(object): | |||
| class _Op(object): | |||
|
|
|||
There was a problem hiding this comment.
maybe add a doc-string here? (e.g. its purpose and args passed)
|
|
||
| index, lidx, ridx = left.index.join(right.index, how='outer', | ||
| return_indexers=True) | ||
| # convert DatetimeIndex to have UTC |
There was a problem hiding this comment.
I don't understand this comment
There was a problem hiding this comment.
Updated the comment to explain below:
If the Series/DataFrame have different tz, the indexes are converted to UTC (on 0.18.1). Added tests also.
base = pd.DatetimeIndex(['2011-01-01', '2011-01-02', '2011-01-03'], tz='UTC')
idx1 = base.tz_convert('Asia/Tokyo')[:2]
idx2 = base.tz_convert('US/Eastern')[1:]
pd.Series([1, 2], index=idx1) + pd.Series([1, 1], index=idx2)
# 2011-01-01 00:00:00+00:00 NaN
# 2011-01-02 00:00:00+00:00 3.0
# 2011-01-03 00:00:00+00:00 NaN
# dtype: float64
There was a problem hiding this comment.
Sorry, still not fully following. Doesn't the alignment already take care of that?
Using your example from above:
In [38]: left = pd.Series([1,2], index=idx1)
In [39]: right = pd.Series([1,2], index=idx2)
In [40]: left, right = left.align(right, copy=False)
In [41]: left.index
Out[41]: DatetimeIndex(['2011-01-01', '2011-01-02', '2011-01-03'], dtype='dateti
me64[ns, UTC]', freq=None)
In [42]: right.index
Out[42]: DatetimeIndex(['2011-01-01', '2011-01-02', '2011-01-03'], dtype='dateti
me64[ns, UTC]', freq=None)
Also, the lidx and ridx does not seem to get used here
There was a problem hiding this comment.
Ah the example was incorrect. Pls try:
rng = pd.date_range('1/1/2011', periods=3, freq='H', tz='US/Eastern')
ts = pd.Series(np.random.randn(len(rng)), index=rng)
ts_moscow = ts.tz_convert('Europe/Moscow')
# UTC
ts + ts_moscow
# 2011-01-01 05:00:00+00:00 1.284372
# 2011-01-01 06:00:00+00:00 -1.729165
# 2011-01-01 07:00:00+00:00 -1.532616
# Freq: H, dtype: float64
# align doesn't
ts.align(ts_moscow)
# 2011-01-01 00:00:00-05:00 0.642186
# 2011-01-01 01:00:00-05:00 -0.864582
# 2011-01-01 02:00:00-05:00 -0.766308
# Freq: H, dtype: float64
# 2011-01-01 08:00:00+03:00 0.642186
# 2011-01-01 09:00:00+03:00 -0.864582
# 2011-01-01 10:00:00+03:00 -0.766308
# Freq: H, dtype: float64
|
Looks good! Small comment |
|
thxs! |
nateGeorge
pushed a commit
to nateGeorge/pandas
that referenced
this pull request
Aug 15, 2016
Author: sinhrks <[email protected]> Closes pandas-dev#13605 from sinhrks/ops_cln2 and squashes the following commits: 729997b [sinhrks] CLN: Cleanup ops.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git diff upstream/master | flake8 --diffCleanup duplicated code paths before fixing some ops related issues.