8000 bpo-40755: Add missing multiset operations to Counter() by rhettinger · Pull Request #20339 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-40755: Add missing multiset operations to Counter() #20339

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 14 commits into from
May 28, 2020
Merged

bpo-40755: Add missing multiset operations to Counter() #20339

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
538878c
Add basic definitions and invariants
rhettinger May 24, 2020
ce91225
Neaten-up
rhettinger May 24, 2020
c160f82
Add blurb
rhettinger May 24, 2020
987532f
Remove the NotImplemented return values
rhettinger May 24, 2020
6a471a1
Handle iterable inputs. Add some tests
rhettinger May 24, 2020
db9e0e6
Clean-up section on omitted operations
rhettinger May 24, 2020
160b365
Improve clarity by separating element values
rhettinger May 24, 2020
9c3e9a6
Add tests. Handle negative values.
rhettinger May 24, 2020
8fc2b87
Isolate the predicate tests with negative counts
rhettinger May 24, 2020
fdbe0c1
Optimized early-out versions. Beef-up docstrings.
rhettinger May 24, 2020
5e20521
Clean-ups and optimization for the common case
rhettinger May 24, 2020
19a8b27
Add documentation
rhettinger May 24, 2020
74c471d
Use subset and superset symbols
rhettinger May 24, 2020
f26a84a
Fix typo in docstring
rhettinger May 26, 2020
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
Prev Previous commit
Next Next commit
Isolate the predicate tests with negative counts
  • Loading branch information
@rhettinger
rhettinger committed May 24, 2020
commit 8fc2b875d817aa167cc8575ef029236714ef71d3
31 changes: 25 additions & 6 deletions Lib/test/test_collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2241,23 +2241,42 @@ def test_multiset_operations_equivalent_to_set_operations(self):

def test_multiset_equal(self):
self.assertTrue(Counter(a=3, b=2, c=0).isequal('ababa'))
self.assertTrue(Counter(a=0, b=-1, c=0).isequal(''))
self.assertFalse(Counter(a=3, b=2).isequal('babab'))

def test_multiset_subset(self):
self.assertTrue(Counter(a=3, b=2, c=0).issubset('ababa'))
self.assertTrue(Counter(a=0, b=-1, c=0).issubset('ababa'))
self.assertTrue(Counter(a=3, b=2, c=0).issubset('abcabcabcd'))
self.assertFalse(Counter(a=3, b=2).issubset('babab'))

def test_multiset_superset(self):
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).issuperset('aab'))
self.assertFalse(Counter(a=3, b=2, c=0, d=-1).issuperset('aabd'))
self.assertTrue(Counter(a=3, b=2, c=0).issuperset('aab'))
self.assertFalse(Counter(a=3, b=2, c=0).issuperset('aabd'))

def test_multiset_disjoint(self):
self.assertTrue(Counter(a=3, b=2, c=0).isdisjoint('cde'))
self.assertFalse(Counter(a=3, b=2, c=0).isdisjoint('bcd'))

def test_multiset_predicates_with_negative_counts(self):
# Multiset predicates run on the output of the elements() method,
# meaning that zero counts and negative counts are ignored.
# The tests below confirm that we get that same results as the
# tests above, even after a negative count has been included
# in either *self* or *other*.
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).isequal('ababa'))
self.assertFalse(Counter(a=3, b=2, d=-1).isequal('babab'))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).issubset('ababa'))
self.assertFalse(Counter(a=3, b=2, d=-1).issubset('babab'))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).issuperset('aab'))
self.assertFalse(Counter(a=3, b=2, c=0, d=-1).issuperset('aabd'))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).isdisjoint('cde'))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).isdisjoint('efgg'))
self.assertFalse(Counter(a=3, b=2, c=0, d=-1).isdisjoint('bcd'))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).isequal(Counter(a=3, b=2, c=-1)))
self.assertFalse(Counter(a=3, b=2, d=-1).isequal(Counter(a=2, b=3, c=-1)))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).issubset(Counter(a=3, b=2, c=-1)))
self.assertFalse(Counter(a=3, b=2, d=-1).issubset(Counter(a=2, b=3, c=-1)))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).issuperset(Counter(a=2, b=1, c=-1)))
self.assertFalse(Counter(a=3, b=2, c=0, d=-1).issuperset(Counter(a=2, b=1, c=-1, d=1)))
self.assertTrue(Counter(a=3, b=2, c=0, d=-1).isdisjoint(Counter(c=1, d=2, e=3, f=-1)))
self.assertFalse(Counter(a=3, b=2, c=0, d=-1).isdisjoint(Counter(b=1, c=1, d=1, e=-1)))


################################################################################
Expand Down
0