-

cool-RR · cool-RR · commit b46d7404da1d · 2014-10-10T22:51:44.000+03:00
diff --git a/source_py3/python_toolbox/nifty_collections/bagging.py b/source_py3/python_toolbox/nifty_collections/bagging.py
@@ -239,7 +239,7 @@ def __add__(self, other):
             return NotImplemented
         return type(self)(self._dict_type(
             (key, self[key] + other[key])
-            for key in OrderedSet(self) & OrderedSet(other))
+            for key in OrderedSet(self) | OrderedSet(other))
         )
 
     def __sub__(self, other):
@@ -258,6 +258,9 @@ def __mul__(self, other):
             return NotImplemented
         return type(self)(self._dict_type((key, count * other) for
                                           key, count in self.items()))
+    
+    __rmul__ = lambda self, other: self * other
+    
     def __floordiv__(self, other):
         if math_tools.is_integer(other):
             return (
diff --git a/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py b/source_py3/test_python_toolbox/test_nifty_collections/test_bagging.py
@@ -264,6 +264,8 @@ def test_operations_with_foreign_operands(self):
         with cute_testing.RaiseAssertor(TypeError): 'foo' * bag
         with cute_testing.RaiseAssertor(TypeError): bag / 'foo'
         with cute_testing.RaiseAssertor(TypeError): 'foo' / bag
+        with cute_testing.RaiseAssertor(TypeError): bag / 3
+        with cute_testing.RaiseAssertor(TypeError): 3 / bag
         with cute_testing.RaiseAssertor(TypeError): bag // 'foo'
         with cute_testing.RaiseAssertor(TypeError): 'foo' // bag
         with cute_testing.RaiseAssertor(TypeError): bag % 'foo'
@@ -287,6 +289,7 @@ def test_operations(self):
         bag_0 = self.bag_type('abbccc')
         bag_1 = self.bag_type('bcc')
         bag_2 = self.bag_type('cddddd')
+        
         assert bag_0 + bag_1 == self.bag_type('abbccc' + 'bcc')
         assert bag_1 + bag_0 == self.bag_type('bcc' + 'abbccc')
         assert bag_0 + bag_2 == self.bag_type('abbccc' + 'cddddd')
@@ -301,6 +304,17 @@ def test_operations(self):
         assert bag_1 - bag_2 == self.bag_type('bc')
         assert bag_2 - bag_1 == self.bag_type('ddddd')
         
+        assert bag_0 * 2 == self.bag_type('abbccc' * 2)
+        assert bag_1 * 2 == self.bag_type('bcc' * 2)
+        assert bag_2 * 2 == self.bag_type('cddddd' * 2)
+        assert 3 * bag_0 == self.bag_type('abbccc' * 3)
+        assert 3 * bag_1 == self.bag_type('bcc' * 3)
+        assert 3 * bag_2 == self.bag_type('cddddd' * 3)
+        
+        assert bag_0 // 2 == self.bag_type('bc')
+        assert bag_1 // 2 == self.bag_type('c')
+        assert bag_2 // 2 == self.bag_type('dd')
+        
         # blocktodo: continue for all operations
         
         
