-

cool-RR · cool-RR · commit e736ba326c8c · 2014-09-24T02:15:10.000+03:00
diff --git a/source_py2/python_toolbox/combi/perm_space.py b/source_py2/python_toolbox/combi/perm_space.py
@@ -148,21 +148,37 @@ def __init__(self, iterable_or_length, domain=None, n_elements=None,
         #                                                                     #
         if isinstance(iterable_or_length, numbers.Integral):
             self.is_rapplied = False
-            self.sequence = xrange(iterable_or_length)
+            self.sequence = sequence_tools.CuteRange(
+                iterable_or_length,
+                _avoid_built_in_range=True
+            )
+            # (Avoiding built-in `xrange` in Python 2 because it lacks
+            # `.index`.)
             self.sequence_length = iterable_or_length
         else:
             assert isinstance(iterable_or_length, collections.Iterable)
             self.sequence = sequence_tools. \
                       ensure_iterable_is_immutable_sequence(iterable_or_length)
-            range_candidate = xrange(len(self.sequence))
+            range_candidate = sequence_tools.CuteRange(
+                len(self.sequence),
+                _avoid_built_in_range=True
+            )
+            # (Avoiding built-in `xrange` in Python 2 because it lacks
+            # `.index`.)
             
             self.is_rapplied = not (
                 cute_iter_tools.are_equal(self.sequence,
                                               range_candidate)
             )
             self.sequence_length = len(self.sequence)
             if not self.is_rapplied:
-                self.sequence = xrange(self.sequence_length)
+                self.sequence = sequence_tools.CuteRange(
+                    self.sequence_length,
+                    _avoid_built_in_range=True
+                )
+                # (Avoiding built-in `xrange` in Python 2 because it lacks
+                # `.index`.)
+                
         
         if self.is_rapplied and (len(set(self.sequence)) < len(self.sequence)):
             # Can implement this later by calculating the actual length.
diff --git a/source_py2/test_python_toolbox/test_combi/test_product_space.py b/source_py2/test_python_toolbox/test_combi/test_product_space.py
@@ -2,6 +2,7 @@
 # This program is distributed under the MIT license.
 
 from python_toolbox import cute_testing
+from python_toolbox import sequence_tools
 
 from python_toolbox.combi import *
 
@@ -39,15 +40,45 @@ def test():
     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)))
-            }
+    # In the following asserts, using `CuteRange` rather than `xrange` because
+    # the latter doesn't have a functional `__hash__`.
     
-    assert ProductSpace((range(4), range(3))) == \
-                                             ProductSpace((range(4), range(3)))
-    assert ProductSpace((range(4), range(3))) != \
-                                             ProductSpace((range(3), range(4)))
+    assert {
+        ProductSpace(
+            (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+             sequence_tools.CuteRange(3, _avoid_built_in_range=True))
+        ),
+        ProductSpace(
+            (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+             sequence_tools.CuteRange(3, _avoid_built_in_range=True))
+        ),
+        ProductSpace(
+            (sequence_tools.CuteRange(3, _avoid_built_in_range=True),
+             sequence_tools.CuteRange(4, _avoid_built_in_range=True))
+        )} == {
+            ProductSpace(
+                (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+                 sequence_tools.CuteRange(3, _avoid_built_in_range=True))
+            ), 
+            ProductSpace(
+                (sequence_tools.CuteRange(3, _avoid_built_in_range=True),
+                 sequence_tools.CuteRange(4, _avoid_built_in_range=True))
+            )
+    }
+    
+    assert ProductSpace(
+        (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+         sequence_tools.CuteRange(3, _avoid_built_in_range=True))
+        ) == ProductSpace(
+            (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+             sequence_tools.CuteRange(3, _avoid_built_in_range=True))
+        )
+    
+    assert ProductSpace(
+        (sequence_tools.CuteRange(4, _avoid_built_in_range=True),
+         sequence_tools.CuteRange(3, _avoid_built_in_range=True))) != \
+           ProductSpace(
+               (sequence_tools.CuteRange(3, _avoid_built_in_range=True),
+                sequence_tools.CuteRange(4, _avoid_built_in_range=True))
+           )
     
