Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
becd5682
Commit
becd5682
authored
Oct 19, 2011
by
Raymond Hettinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #13121: Support in-place math operators for collections.Counter().
parent
3bb8be6d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
86 additions
and
1 deletion
+86
-1
Doc/library/collections.rst
Doc/library/collections.rst
+1
-1
Lib/collections/__init__.py
Lib/collections/__init__.py
+63
-0
Lib/test/test_collections.py
Lib/test/test_collections.py
+21
-0
Misc/NEWS
Misc/NEWS
+1
-0
No files found.
Doc/library/collections.rst
View file @
becd5682
...
...
@@ -293,7 +293,7 @@ or subtracting from an empty counter.
Counter({'b': 4})
.. versionadded:: 3.3
Added support for unary plus
and unary minu
s.
Added support for unary plus
, unary minus, and in-place multiset operation
s.
.. note::
...
...
Lib/collections/__init__.py
View file @
becd5682
...
...
@@ -683,6 +683,69 @@ class Counter(dict):
'''
return
Counter
()
-
self
def
_keep_positive
(
self
):
'''Internal method to strip elements with a negative or zero count'''
nonpositive
=
[
elem
for
elem
,
count
in
self
.
items
()
if
not
count
>
0
]
for
elem
in
nonpositive
:
del
self
[
elem
]
return
self
def
__iadd__
(
self
,
other
):
'''Inplace add from another counter, keeping only positive counts.
>>> c = Counter('abbb')
>>> c += Counter('bcc')
>>> c
Counter({'b': 4, 'c': 2, 'a': 1})
'''
for
elem
,
count
in
other
.
items
():
self
[
elem
]
+=
count
return
self
.
_keep_positive
()
def
__isub__
(
self
,
other
):
'''Inplace subtract counter, but keep only results with positive counts.
>>> c = Counter('abbbc')
>>> c -= Counter('bccd')
>>> c
Counter({'b': 2, 'a': 1})
'''
for
elem
,
count
in
other
.
items
():
self
[
elem
]
-=
count
return
self
.
_keep_positive
()
def
__ior__
(
self
,
other
):
'''Inplace union is the maximum of value from either counter.
>>> c = Counter('abbb')
>>> c |= Counter('bcc')
>>> c
Counter({'b': 3, 'c': 2, 'a': 1})
'''
for
elem
,
other_count
in
other
.
items
():
count
=
self
[
elem
]
if
other_count
>
count
:
self
[
elem
]
=
other_count
return
self
.
_keep_positive
()
def
__iand__
(
self
,
other
):
'''Inplace intersection is the minimum of corresponding counts.
>>> c = Counter('abbb')
>>> c &= Counter('bcc')
>>> c
Counter({'b': 1})
'''
for
elem
,
count
in
self
.
items
():
other_count
=
other
[
elem
]
if
other_count
<
count
:
self
[
elem
]
=
other_count
return
self
.
_keep_positive
()
########################################################################
### ChainMap (helper for configparser and string.Template)
...
...
Lib/test/test_collections.py
View file @
becd5682
...
...
@@ -932,6 +932,27 @@ class TestCounter(unittest.TestCase):
set_result
=
setop
(
set
(
p
.
elements
()),
set
(
q
.
elements
()))
self
.
assertEqual
(
counter_result
,
dict
.
fromkeys
(
set_result
,
1
))
def
test_inplace_operations
(
self
):
elements
=
'abcd'
for
i
in
range
(
1000
):
# test random pairs of multisets
p
=
Counter
(
dict
((
elem
,
randrange
(
-
2
,
4
))
for
elem
in
elements
))
p
.
update
(
e
=
1
,
f
=-
1
,
g
=
0
)
q
=
Counter
(
dict
((
elem
,
randrange
(
-
2
,
4
))
for
elem
in
elements
))
q
.
update
(
h
=
1
,
i
=-
1
,
j
=
0
)
for
inplace_op
,
regular_op
in
[
(
Counter
.
__iadd__
,
Counter
.
__add__
),
(
Counter
.
__isub__
,
Counter
.
__sub__
),
(
Counter
.
__ior__
,
Counter
.
__or__
),
(
Counter
.
__iand__
,
Counter
.
__and__
),
]:
c
=
p
.
copy
()
c_id
=
id
(
c
)
regular_result
=
regular_op
(
c
,
q
)
inplace_result
=
inplace_op
(
c
,
q
)
self
.
assertEqual
(
inplace_result
,
regular_result
)
self
.
assertEqual
(
id
(
inplace_result
),
c_id
)
def
test_subtract
(
self
):
c
=
Counter
(
a
=-
5
,
b
=
0
,
c
=
5
,
d
=
10
,
e
=
15
,
g
=
40
)
c
.
subtract
(
a
=
1
,
b
=
2
,
c
=-
3
,
d
=
10
,
e
=
20
,
f
=
30
,
h
=-
50
)
...
...
Misc/NEWS
View file @
becd5682
...
...
@@ -488,6 +488,7 @@ Library
in
os
.
kill
().
-
Add
support
for
unary
plus
and
unary
minus
to
collections
.
Counter
().
Issue
#
13121
:
Also
an
support
for
inplace
math
operators
.
-
Issue
#
12683
:
urlparse
updated
to
include
svn
as
schemes
that
uses
relative
paths
.
(
svn
from
1.5
onwards
support
relative
path
).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment