-

cool-RR · cool-RR · commit 880b7a182a0d · 2014-09-21T02:50:55.000+03:00
diff --git a/source_py3/python_toolbox/combi/product_space.py b/source_py3/python_toolbox/combi/product_space.py
@@ -28,7 +28,7 @@ def __init__(self, sequences):
                                ensure_iterable_is_immutable_sequence(sequences)
         self.sequence_lengths = tuple(map(sequence_tools.get_length,
                                           self.sequences))
-        self.length = misc_tools.general_product(self.sequence_lengths)
+        self.length = math_tools.product(self.sequence_lengths)
         
     def __repr__(self):
         return '<%s: %s>' % (
@@ -58,7 +58,7 @@ def __getitem__(self, i):
     
         
     _reduced = property(lambda self: (type(self), self.sequences))
-             
+    __hash__ = lambda self: hash(self._reduced)
     __eq__ = lambda self, other: (isinstance(other, ProductSpace) and
                                   self._reduced == other._reduced)
     
diff --git a/source_py3/python_toolbox/math_tools/misc.py b/source_py3/python_toolbox/math_tools/misc.py
@@ -127,3 +127,8 @@ def binomial(big, small):
         return (math.factorial(big) // math.factorial(big - small)
                                                       // math.factorial(small))
 
+
+def product(numbers):
+    from python_toolbox import misc_tools
+    return misc_tools.general_product(numbers, start=1)
+    
diff --git a/source_py3/test_python_toolbox/test_combi/test_product_space.py b/source_py3/test_python_toolbox/test_combi/test_product_space.py
@@ -1,6 +1,8 @@
 # Copyright 2009-2014 Ram Rachum.
 # This program is distributed under the MIT license.
 
+from python_toolbox import cute_testing
+
 from python_toolbox.combi import *
 
 
@@ -16,4 +18,34 @@ def test_product_spaces():
     assert perm_1 in big_perm_space
     assert (perm_0, perm_1) in product_space
     assert product_space.index((perm_0, perm_1)) == 10 ** 10
-    assert ( ~ perm_0,  ~ perm_1) in product_space
+    assert (~ perm_0, ~ perm_1) in product_space
+    assert repr(product_space) == (
+        '<ProductSpace: 933262154439441526816992388562667004907159682643816214'
+        '685929638952175999932299156089414639761565182862536979208272237582511'
+        '85210916864000000000000000000000000 * 208755412068>'
+    )
+    
+    assert product_space
+    assert not ProductSpace(((),))
+    assert not ProductSpace(((), {}))
+    with cute_testing.RaiseAssertor(IndexError):
+        product_space[product_space.length]
+    with cute_testing.RaiseAssertor(IndexError):
+        product_space[product_space.length + 7]
+    with cute_testing.RaiseAssertor(IndexError):
+        product_space[-product_space.length - 1]
+    with cute_testing.RaiseAssertor(IndexError):
+        product_space[-product_space.length - 100]
+    
+    assert {ProductSpace((range(4), range(3))),
+            ProductSpace((range(4), range(3))),
+            ProductSpace((range(3), range(4)))} == {
+                ProductSpace((range(4), range(3))), 
+                ProductSpace((range(3), range(4)))
+            }
+    
+    assert ProductSpace((range(4), range(3))) == \
+                                             ProductSpace((range(4), range(3)))
+    assert ProductSpace((range(4), range(3))) != \
+                                             ProductSpace((range(3), range(4)))
+    
