mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Minor code rearrangement to group related methods together. (GH-30813)

Browse source 
* Make example more focused with math.prod()
* Move comparison tests to the multiset operations section
This commit is contained in:
Raymond Hettinger 2022-01-22 18:47:22 -06:00 • committed by GitHub
parent a1444f4358
commit bcacab47bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Lib/collections/__init__.py
View file

@ -617,11 +617,9 @@ class Counter(dict):
['A', 'A', 'B', 'B', 'C', 'C'] ['A', 'A', 'B', 'B', 'C', 'C']
# Knuth's example for prime factors of 1836: 2**2 * 3**3 * 17**1 # Knuth's example for prime factors of 1836: 2**2 * 3**3 * 17**1
>>> import math
>>> prime_factors = Counter({2: 2, 3: 3, 17: 1}) >>> prime_factors = Counter({2: 2, 3: 3, 17: 1})
>>> product = 1 >>> math.prod(prime_factors.elements())
>>> for factor in prime_factors.elements(): # loop over factors
... product *= factor # and multiply them
>>> product
1836 1836
Note, if an element's count has been set to zero or is a negative Note, if an element's count has been set to zero or is a negative
@ -718,42 +716,6 @@ class Counter(dict):
if elem in self: if elem in self:
super().__delitem__(elem) super().__delitem__(elem)
def __eq__(self, other):
'True if all counts agree. Missing counts are treated as zero.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] == other[e] for c in (self, other) for e in c)
def __ne__(self, other):
'True if any counts disagree. Missing counts are treated as zero.'
if not isinstance(other, Counter):
return NotImplemented
return not self == other
def __le__(self, other):
'True if all counts in self are a subset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] <= other[e] for c in (self, other) for e in c)
def __lt__(self, other):
'True if all counts in self are a proper subset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return self <= other and self != other
def __ge__(self, other):
'True if all counts in self are a superset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] >= other[e] for c in (self, other) for e in c)
def __gt__(self, other):
'True if all counts in self are a proper superset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return self >= other and self != other
def __repr__(self): def __repr__(self):
if not self: if not self:
return f'{self.__class__.__name__}()' return f'{self.__class__.__name__}()'
@ -795,6 +757,42 @@ class Counter(dict):
# (cp >= cq) == (sp >= sq) # (cp >= cq) == (sp >= sq)
# (cp > cq) == (sp > sq) # (cp > cq) == (sp > sq)
def __eq__(self, other):
'True if all counts agree. Missing counts are treated as zero.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] == other[e] for c in (self, other) for e in c)
def __ne__(self, other):
'True if any counts disagree. Missing counts are treated as zero.'
if not isinstance(other, Counter):
return NotImplemented
return not self == other
def __le__(self, other):
'True if all counts in self are a subset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] <= other[e] for c in (self, other) for e in c)
def __lt__(self, other):
'True if all counts in self are a proper subset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return self <= other and self != other
def __ge__(self, other):
'True if all counts in self are a superset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return all(self[e] >= other[e] for c in (self, other) for e in c)
def __gt__(self, other):
'True if all counts in self are a proper superset of those in other.'
if not isinstance(other, Counter):
return NotImplemented
return self >= other and self != other
def __add__(self, other): def __add__(self, other):
'''Add counts from two counters. '''Add counts from two counters.