Skip to content

BUG/CLN: Clear _tuples on setting MI levels/labels #5215

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 1 commit into from
Oct 14, 2013
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions doc/source/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,9 @@ Bug Fixes
- Bug in ``to_datetime`` with a format and ``coerce=True`` not raising (:issue:`5195`)
- Bug in ``loc`` setting with multiple indexers and a rhs of a Series that needs
broadcasting (:issue:`5206`)
- Fixed bug where inplace setting of levels or labels on ``MultiIndex`` would
not clear cached ``values`` property and therefore return wrong ``values``.
(:issue:`5215`)

pandas 0.12.0
-------------
Expand Down
4 changes: 3 additions & 1 deletion pandas/core/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -1903,8 +1903,9 @@ def _set_levels(self, levels, copy=False, validate=True):
for lev in levels)
names = self.names
self._levels = levels
if len(names):
if any(names):
self._set_names(names)
self._tuples = None

def set_levels(self, levels, inplace=False):
"""
Expand Down Expand Up @@ -1947,6 +1948,7 @@ def _set_labels(self, labels, copy=False, validate=True):
raise ValueError("Length of labels must match length of levels")
self._labels = FrozenList(_ensure_frozen(labs, copy=copy)._shallow_copy()
for labs in labels)
self._tuples = None

def set_labels(self, labels, inplace=False):
"""
Expand Down
35 changes: 35 additions & 0 deletions pandas/tests/test_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,41 @@ def test_metadata_immutable(self):
with assertRaisesRegexp(TypeError, mutable_regex):
names[0] = names[0]

def test_inplace_mutation_resets_values(self):
levels = [['a', 'b', 'c'], [4]]
levels2 = [[1, 2, 3], ['a']]
labels = [[0, 1, 0, 2, 2, 0], [0, 0, 0, 0, 0, 0]]
mi1 = MultiIndex(levels=levels, labels=labels)
mi2 = MultiIndex(levels=levels2, labels=labels)
vals = mi1.values.copy()
vals2 = mi2.values.copy()
self.assert_(mi1._tuples is not None)

# make sure level setting works
new_vals = mi1.set_levels(levels2).values
assert_almost_equal(vals2, new_vals)
# non-inplace doesn't kill _tuples [implementation detail]
assert_almost_equal(mi1._tuples, vals)
# and values is still same too
assert_almost_equal(mi1.values, vals)

# inplace should kill _tuples
mi1.set_levels(levels2, inplace=True)
assert_almost_equal(mi1.values, vals2)

# make sure label setting works too
labels2 = [[0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0]]
exp_values = np.array([(1, 'a')] * 6, dtype=object)
new_values = mi2.set_labels(labels2).values
# not inplace shouldn't change
assert_almost_equal(mi2._tuples, vals2)
# should have correct values
assert_almost_equal(exp_values, new_values)

# and again setting inplace should kill _tuples, etc
mi2.set_labels(labels2, inplace=True)
assert_almost_equal(mi2.values, new_values)

def test_copy_in_constructor(self):
levels = np.array(["a", "b", "c"])
labels = np.array([1, 1, 2, 0, 0, 1, 1])
Expand Down
5 changes: 3 additions & 2 deletions pandas/util/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,14 +382,15 @@ def assert_almost_equal(a, b, check_less_precise=False):
return assert_dict_equal(a, b)

if isinstance(a, compat.string_types):
assert a == b, "%s != %s" % (a, b)
assert a == b, "%r != %r" % (a, b)
return True

if isiterable(a):
np.testing.assert_(isiterable(b))
na, nb = len(a), len(b)
assert na == nb, "%s != %s" % (na, nb)
if np.array_equal(a, b):
if isinstance(a, np.ndarray) and isinstance(b, np.ndarray) and\
np.array_equal(a, b):
return True
else:
for i in range(na):
Expand Down