Skip to content

BUG-26988 implement replace for categorical blocks #27026

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.

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 18 commits into from
Nov 16, 2019
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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.25.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ Categorical

- Bug in :func:`DataFrame.at` and :func:`Series.at` that would raise exception if the index was a :class:`CategoricalIndex` (:issue:`20629`)
- Fixed bug in comparison of ordered :class:`Categorical` that contained missing values with a scalar which sometimes incorrectly resulted in ``True`` (:issue:`26504`)
- Bug in :func:`DataFrame.replace` and :func:`Series.replace` that would give incorrect results on categorical data (:issue:`26988`)
Copy link
Contributor

Choose a reason for hiding this comment

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

move the note to 1.0

-

Datetimelike
Expand Down
24 changes: 24 additions & 0 deletions pandas/core/internals/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -2978,6 +2978,30 @@ def where(self, other, cond, align=True, errors='raise',
axis=axis, transpose=transpose)
return result

def replace(self, to_replace, value, inplace=False, filter=None,
regex=False, convert=True):
result = self if inplace else self.copy()
if filter is None:
Copy link
Contributor

Choose a reason for hiding this comment

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

what case hits this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

filter is none when replace is called on a Series as opposed to a DataFrame

Copy link
Member

Choose a reason for hiding this comment

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

I still find this non-obvious. can you add a comment to this effect

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i added a comment

categories = result.values.categories.tolist()
if to_replace in categories:
Copy link
Contributor

Choose a reason for hiding this comment

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

can we not define a Categorical.replace to handle this code here (from 3013 thru 3020)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done, with tests added in pandas/tests/arrays/categorical/test_algos.py

if isna(value):
result.values.remove_categories(to_replace, inplace=True)
else:
index = categories.index(to_replace)
categories[index] = value
result.values.rename_categories(categories, inplace=True)
if convert:
return result.convert(by_item=True, numeric=False,
copy=not inplace)
else:
return result
else:
if not isna(value):
result.values.add_categories(value, inplace=True)
return super(CategoricalBlock, result).replace(to_replace, value,
inplace, filter,
regex, convert)


# -----------------------------------------------------------------
# Constructor Helpers
Expand Down
18 changes: 18 additions & 0 deletions pandas/tests/frame/test_replace.py
Original file line number Diff line number Diff line change
Expand Up @@ -1149,3 +1149,21 @@ def test_replace_method(self, to_replace, method, expected):
result = df.replace(to_replace=to_replace, value=None, method=method)
expected = DataFrame(expected)
assert_frame_equal(result, expected)

@pytest.mark.parametrize("replace_dict, final_data", [
({'a': 1, 'b': 1}, [[3, 3], [2, 2]]),
({'a': 1, 'b': 2}, [[3, 1], [2, 3]])
])
def test_categorical_replace_with_dict(self, replace_dict, final_data):
# GH 26988
df = DataFrame([[1, 1], [2, 2]], columns=['a', 'b'], dtype='category')
expected = DataFrame(final_data, columns=['a', 'b'], dtype='category')
expected['a'] = expected['a'].cat.set_categories([1, 2, 3])
expected['b'] = expected['b'].cat.set_categories([1, 2, 3])
result = df.replace(replace_dict, 3)
assert_frame_equal(result, expected)
with pytest.raises(AssertionError):
# ensure non-inplace call does not affect original
assert_frame_equal(df, expected)
df.replace(replace_dict, 3, inplace=True)
assert_frame_equal(df, expected)
19 changes: 19 additions & 0 deletions pandas/tests/series/test_replace.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,25 @@ def test_replace_categorical(self, categorical, numeric):
expected = pd.Series(numeric)
tm.assert_series_equal(expected, result, check_dtype=False)

def test_replace_categorical_single(self):
# GH 26988
dti = pd.date_range('2016-01-01', periods=3, tz='US/Pacific')
s = pd.Series(dti)
c = s.astype('category')

expected = c.copy()
expected = expected.cat.add_categories('foo')
expected[2] = 'foo'
expected = expected.cat.remove_unused_categories()
assert c[2] != 'foo'

result = c.replace(c[2], 'foo')
tm.assert_series_equal(expected, result)
assert c[2] != 'foo' # ensure non-inplace call does not alter original

c.replace(c[2], 'foo', inplace=True)
tm.assert_series_equal(expected, c)

def test_replace_with_no_overflowerror(self):
# GH 25616
# casts to object without Exception from OverflowError
Expand Down