-

cool-RR · cool-RR · commit 06cf0de354b0 · 2013-10-26T01:46:37.000+03:00
diff --git a/source_py2/python_toolbox/nifty_collections/frozen_counter.py b/source_py2/python_toolbox/nifty_collections/frozen_counter.py
@@ -43,6 +43,10 @@ def __init__(self, iterable=None, **kwargs):
                     self._dict[element] = self_get(element, 0) + 1
         if kwargs:
             self._dict.update(kwargs)
+            
+        for key, value in self.items():
+            if value == 0:
+                del self._dict[key]
 
 
     __getitem__ = lambda self, key: self._dict.get(key, 0)
@@ -159,7 +163,7 @@ def __or__(self, other):
         '''
         if not isinstance(other, FrozenCounter):
             return NotImplemented
-        result = Counter()
+        result = collections.Counter()
         for element, count in self.items():
             other_count = other[element]
             new_count = other_count if count < other_count else count
@@ -179,7 +183,7 @@ def __and__(self, other):
         '''
         if not isinstance(other, FrozenCounter):
             return NotImplemented
-        result = Counter()
+        result = collections.Counter()
         for element, count in self.items():
             other_count = other[element]
             new_count = count if count < other_count else other_count
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_lazy_tuple/test_frozen_counter.py b/source_py2/test_python_toolbox/test_nifty_collections/test_lazy_tuple/test_frozen_counter.py
@@ -41,4 +41,20 @@ def test():
            FrozenCounter({'a': 5, 'r': 2, 'b': 2, 'c': 1, 'd': 1,
                           'meow': 9,})
     
+    assert frozen_counter.most_common() == \
+                              collections.Counter(frozen_counter).most_common()
+    
+    assert frozen_counter + frozen_counter == FrozenCounter('abracadabra'*2)
+    assert frozen_counter - frozen_counter == FrozenCounter()
+    assert frozen_counter - FrozenCounter('a') == FrozenCounter('abracadabr')
+    assert frozen_counter - FrozenCounter('a') == FrozenCounter('abracadabr')
+    assert frozen_counter | FrozenCounter('a') == frozen_counter
+    assert frozen_counter | frozen_counter == \
+           frozen_counter | frozen_counter | frozen_counter == \
+                                                                 frozen_counter
+    assert frozen_counter & FrozenCounter('a') == FrozenCounter('a')
+    assert frozen_counter & frozen_counter == \
+           frozen_counter & frozen_counter & frozen_counter == \
+                                                                 frozen_counter
+    
     assert repr(frozen_counter).startswith('FrozenCounter(')
