Skip to content

Commit 351138d

Browse files
committed
Add optional sort parameter to difference method in subclasses
1 parent bc68c37 commit 351138d

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

doc/source/whatsnew/v0.24.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ Other Enhancements
238238
- Added :meth:`Interval.overlaps`, :meth:`IntervalArray.overlaps`, and :meth:`IntervalIndex.overlaps` for determining overlaps between interval-like objects (:issue:`21998`)
239239
- :func:`~DataFrame.to_parquet` now supports writing a ``DataFrame`` as a directory of parquet files partitioned by a subset of the columns when ``engine = 'pyarrow'`` (:issue:`23283`)
240240
- :meth:`Timestamp.tz_localize`, :meth:`DatetimeIndex.tz_localize`, and :meth:`Series.tz_localize` have gained the ``nonexistent`` argument for alternative handling of nonexistent times. See :ref:`timeseries.timezone_nonexsistent` (:issue:`8917`)
241+
- :meth:`Index.difference` now has an optional ``sort`` parameter to specify whether the results should be sorted if possible (:issue:`17839`)
241242

242243
.. _whatsnew_0240.api_breaking:
243244

pandas/core/indexes/multi.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,10 +2769,18 @@ def intersection(self, other):
27692769
return MultiIndex.from_arrays(lzip(*uniq_tuples), sortorder=0,
27702770
names=result_names)
27712771

2772-
def difference(self, other):
2772+
def difference(self, other, sort=True):
27732773
"""
27742774
Compute sorted set difference of two MultiIndex objects
27752775
2776+
Parameters
2777+
----------
2778+
other : MultiIndex
2779+
sort : bool, default True
2780+
Sort the resulting MultiIndex if possible
2781+
2782+
.. versionadded:: 0.24.0
2783+
27762784
Returns
27772785
-------
27782786
diff : MultiIndex
@@ -2788,8 +2796,10 @@ def difference(self, other):
27882796
labels=[[]] * self.nlevels,
27892797
names=result_names, verify_integrity=False)
27902798

2791-
difference = sorted(set(self._ndarray_values) -
2792-
set(other._ndarray_values))
2799+
difference = set(self._ndarray_values) - set(other._ndarray_values)
2800+
2801+
if sort:
2802+
difference = sorted(difference)
27932803

27942804
if len(difference) == 0:
27952805
return MultiIndex(levels=[[]] * self.nlevels,

pandas/tests/indexes/test_base.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,15 +1104,17 @@ def test_iadd_string(self):
11041104

11051105
@pytest.mark.parametrize("second_name,expected", [
11061106
(None, None), ('name', 'name')])
1107-
def test_difference_name_preservation(self, second_name, expected):
1107+
@pytest.mark.parametrize("sort", [
1108+
(True, False)])
1109+
def test_difference_name_preservation(self, second_name, expected, sort):
11081110
# TODO: replace with fixturesult
11091111
first = self.strIndex[5:20]
11101112
second = self.strIndex[:10]
11111113
answer = self.strIndex[10:20]
11121114

11131115
first.name = 'name'
11141116
second.name = second_name
1115-
result = first.difference(second)
1117+
result = first.difference(second, sort)
11161118

11171119
assert tm.equalContents(result, answer)
11181120

@@ -1121,18 +1123,22 @@ def test_difference_name_preservation(self, second_name, expected):
11211123
else:
11221124
assert result.name == expected
11231125

1124-
def test_difference_empty_arg(self):
1126+
@pytest.mark.parametrize("sort", [
1127+
(True, False)])
1128+
def test_difference_empty_arg(self, sort):
11251129
first = self.strIndex[5:20]
11261130
first.name == 'name'
1127-
result = first.difference([])
1131+
result = first.difference([], sort=sort)
11281132

11291133
assert tm.equalContents(result, first)
11301134
assert result.name == first.name
11311135

1132-
def test_difference_identity(self):
1136+
@pytest.mark.parametrize("sort", [
1137+
(True, False)])
1138+
def test_difference_identity(self, sort):
11331139
first = self.strIndex[5:20]
11341140
first.name == 'name'
1135-
result = first.difference(first)
1141+
result = first.difference(first, sort)
11361142

11371143
assert len(result) == 0
11381144
assert result.name == first.name
@@ -1181,13 +1187,15 @@ def test_symmetric_difference_non_index(self):
11811187
assert tm.equalContents(result, expected)
11821188
assert result.name == 'new_name'
11831189

1184-
def test_difference_type(self):
1190+
@pytest.mark.parametrize("sort", [
1191+
(True, False)])
1192+
def test_difference_type(self, sort):
11851193
# GH 20040
11861194
# If taking difference of a set and itself, it
11871195
# needs to preserve the type of the index
11881196
skip_index_keys = ['repeats']
11891197
for key, index in self.generate_index_types(skip_index_keys):
1190-
result = index.difference(index)
1198+
result = index.difference(index, sort)
11911199
expected = index.drop(index)
11921200
tm.assert_index_equal(result, expected)
11931201

@@ -2401,13 +2409,15 @@ def test_intersection_different_type_base(self, klass):
24012409
result = first.intersection(klass(second.values))
24022410
assert tm.equalContents(result, second)
24032411

2404-
def test_difference_base(self):
2412+
@pytest.mark.parametrize("sort", [
2413+
(True, False)])
2414+
def test_difference_base(self, sort):
24052415
# (same results for py2 and py3 but sortedness not tested elsewhere)
24062416
index = self.create_index()
24072417
first = index[:4]
24082418
second = index[3:]
24092419

2410-
result = first.difference(second)
2420+
result = first.difference(second, sort)
24112421
expected = Index([0, 1, 'a'])
24122422
tm.assert_index_equal(result, expected)
24132423

0 commit comments

Comments
 (0)