Skip to content

Fix PeriodIndex.get_indexer with non-PI #30686

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 1 commit into from
Jan 4, 2020
Merged

Fix PeriodIndex.get_indexer with non-PI #30686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 9 additions & 15 deletions pandas/core/indexes/period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,15 +564,12 @@ def get_value(self, series, key):
def get_indexer(self, target, method=None, limit=None, tolerance=None):
target = ensure_index(target)

if hasattr(target, "freq") and target.freq != self.freq:
msg = DIFFERENT_FREQ.format(
cls=type(self).__name__,
own_freq=self.freqstr,
other_freq=target.freqstr,
)
raise IncompatibleFrequency(msg)

if isinstance(target, PeriodIndex):
if target.freq != self.freq:
# No matches
no_matches = -1 * np.ones(self.shape, dtype=np.intp)
return no_matches

target = target.asi8
self_index = self._int64index
else:
Expand All @@ -587,14 +584,11 @@ def get_indexer_non_unique(self, target):
target = ensure_index(target)

if isinstance(target, PeriodIndex):
if target.freq != self.freq:
no_matches = -1 * np.ones(self.shape, dtype=np.intp)
return no_matches, no_matches

target = target.asi8
if hasattr(target, "freq") and target.freq != self.freq:
msg = DIFFERENT_FREQ.format(
cls=type(self).__name__,
own_freq=self.freqstr,
other_freq=target.freqstr,
)
raise IncompatibleFrequency(msg)

indexer, missing = self._int64index.get_indexer_non_unique(target)
return ensure_platform_int(indexer), missing
Expand Down
29 changes: 29 additions & 0 deletions pandas/tests/indexes/period/test_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,35 @@ def test_get_indexer(self):
res = idx.get_indexer(target, "nearest", tolerance=pd.Timedelta("1 day"))
tm.assert_numpy_array_equal(res, np.array([0, 0, 1, -1], dtype=np.intp))

def test_get_indexer_mismatched_dtype(self):
# Check that we return all -1s and do not raise or cast incorrectly

dti = pd.date_range("2016-01-01", periods=3)
pi = dti.to_period("D")
pi2 = dti.to_period("W")

expected = np.array([-1, -1, -1], dtype=np.intp)

result = pi.get_indexer(dti)
tm.assert_numpy_array_equal(result, expected)

# This should work in both directions
result = dti.get_indexer(pi)
tm.assert_numpy_array_equal(result, expected)

result = pi.get_indexer(pi2)
tm.assert_numpy_array_equal(result, expected)

# We expect the same from get_indexer_non_unique
result = pi.get_indexer_non_unique(dti)[0]
tm.assert_numpy_array_equal(result, expected)

result = dti.get_indexer_non_unique(pi)[0]
tm.assert_numpy_array_equal(result, expected)

result = pi.get_indexer_non_unique(pi2)[0]
tm.assert_numpy_array_equal(result, expected)

def test_get_indexer_non_unique(self):
# GH 17717
p1 = pd.Period("2017-09-02")
Expand Down