Skip to content

Commit

Permalink
ENH: preserve RangeIndex in factorize (#38034)
Browse files Browse the repository at this point in the history
* ENH: preserve RangeIndex in factorize

* dedoc

* ensure np.intp

* 32bit compat

* if->elif
  • Loading branch information
jbrockmendel authored Nov 26, 2020
1 parent 78d1498 commit 090d6a1
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 2 deletions.
5 changes: 4 additions & 1 deletion pandas/core/algorithms.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
ABCExtensionArray,
ABCIndexClass,
ABCMultiIndex,
ABCRangeIndex,
ABCSeries,
)
from pandas.core.dtypes.missing import isna, na_value_for_dtype
Expand Down Expand Up @@ -682,7 +683,9 @@ def factorize(
na_sentinel = -1
dropna = False

if is_extension_array_dtype(values.dtype):
if isinstance(values, ABCRangeIndex):
return values.factorize(sort=sort)
elif is_extension_array_dtype(values.dtype):
values = extract_array(values)
codes, uniques = values.factorize(na_sentinel=na_sentinel)
dtype = original.dtype
Expand Down
12 changes: 11 additions & 1 deletion pandas/core/indexes/range.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import timedelta
import operator
from sys import getsizeof
from typing import Any, List
from typing import Any, List, Optional, Tuple
import warnings

import numpy as np
Expand Down Expand Up @@ -461,6 +461,16 @@ def argsort(self, *args, **kwargs) -> np.ndarray:
else:
return np.arange(len(self) - 1, -1, -1)

def factorize(
self, sort: bool = False, na_sentinel: Optional[int] = -1
) -> Tuple[np.ndarray, "RangeIndex"]:
codes = np.arange(len(self), dtype=np.intp)
uniques = self
if sort and self.step < 0:
codes = codes[::-1]
uniques = uniques[::-1]
return codes, uniques

def equals(self, other: object) -> bool:
"""
Determines if two Index objects contain the same elements.
Expand Down
10 changes: 10 additions & 0 deletions pandas/tests/arrays/categorical/test_constructors.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,16 @@ def test_constructor_with_generator(self):
cat = Categorical([0, 1, 2], categories=range(3))
tm.assert_categorical_equal(cat, exp)

def test_constructor_with_rangeindex(self):
# RangeIndex is preserved in Categories
rng = Index(range(3))

cat = Categorical(rng)
tm.assert_index_equal(cat.categories, rng, exact=True)

cat = Categorical([1, 2, 0], categories=rng)
tm.assert_index_equal(cat.categories, rng, exact=True)

@pytest.mark.parametrize(
"dtl",
[
Expand Down
8 changes: 8 additions & 0 deletions pandas/tests/indexes/multi/test_constructors.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,14 @@ def test_from_product_datetimeindex():
tm.assert_numpy_array_equal(mi.values, etalon)


def test_from_product_rangeindex():
# RangeIndex is preserved by factorize, so preserved in levels
rng = Index(range(5))
other = ["a", "b"]
mi = MultiIndex.from_product([rng, other])
tm.assert_index_equal(mi._levels[0], rng, exact=True)


@pytest.mark.parametrize("ordered", [False, True])
@pytest.mark.parametrize("f", [lambda x: x, lambda x: Series(x), lambda x: x.values])
def test_from_product_index_series_categorical(ordered, f):
Expand Down
33 changes: 33 additions & 0 deletions pandas/tests/test_algos.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,39 @@ def test_datetime64_factorize(self, writable):
tm.assert_numpy_array_equal(codes, expected_codes)
tm.assert_numpy_array_equal(uniques, expected_uniques)

@pytest.mark.parametrize("sort", [True, False])
def test_factorize_rangeindex(self, sort):
# increasing -> sort doesn't matter
ri = pd.RangeIndex.from_range(range(10))
expected = np.arange(10, dtype=np.intp), ri

result = algos.factorize(ri, sort=sort)
tm.assert_numpy_array_equal(result[0], expected[0])
tm.assert_index_equal(result[1], expected[1], exact=True)

result = ri.factorize(sort=sort)
tm.assert_numpy_array_equal(result[0], expected[0])
tm.assert_index_equal(result[1], expected[1], exact=True)

@pytest.mark.parametrize("sort", [True, False])
def test_factorize_rangeindex_decreasing(self, sort):
# decreasing -> sort matters
ri = pd.RangeIndex.from_range(range(10))
expected = np.arange(10, dtype=np.intp), ri

ri2 = ri[::-1]
expected = expected[0], ri2
if sort:
expected = expected[0][::-1], expected[1][::-1]

result = algos.factorize(ri2, sort=sort)
tm.assert_numpy_array_equal(result[0], expected[0])
tm.assert_index_equal(result[1], expected[1], exact=True)

result = ri2.factorize(sort=sort)
tm.assert_numpy_array_equal(result[0], expected[0])
tm.assert_index_equal(result[1], expected[1], exact=True)

def test_deprecate_order(self):
# gh 19727 - check warning is raised for deprecated keyword, order.
# Test not valid once order keyword is removed.
Expand Down

0 comments on commit 090d6a1

Please sign in to comment.