-

cool-RR · cool-RR · commit 2051ccc0f777 · 2014-09-20T01:53:21.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm.py b/source_py3/python_toolbox/combi/perm.py
@@ -211,7 +211,8 @@ def number(self):
     def _perm_sequence(self):
         assert (0 <= self.number < 
                                  self.just_dapplied_rapplied_perm_space.length)
-        n_digits_pad = 0 if self.is_infinite else self.length
+        n_digits_pad = 0 if self.is_infinite else \
+                         self.just_dapplied_rapplied_perm_space.sequence_length
         factoradic_number = math_tools.to_factoradic(
             self.number * math.factorial(
                  self.just_dapplied_rapplied_perm_space.n_unused_elements),
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -420,7 +420,7 @@ def __repr__(self):
         )
         
     def __getitem__(self, i):
-        if isinstance(i, slice):
+        if isinstance(i, (slice, sequence_tools.CanonicalSlice)):
             canonical_slice = sequence_tools.CanonicalSlice(
                 i, self.length, offset=self.canonical_slice.start
             )
@@ -547,6 +547,13 @@ def index(self, perm):
         except sequence_tools.UnorderedIterableException:
             raise ValueError('An unordered iterable is never contained in a '
                              'non-combination `PermSpace`.')
+        if isinstance(perm, Perm) and perm.is_infinite:
+            if self.is_infinite:
+                assert self == infinite_pure_perm_space
+                return perm.number
+            else:
+                raise ValueError
+        
         perm_set = set(perm)
         if not (perm_set <= set(self.sequence)):
             raise ValueError
diff --git a/source_py3/test_python_toolbox/test_combi/test_perm_space.py b/source_py3/test_python_toolbox/test_combi/test_perm_space.py
@@ -184,7 +184,7 @@ def test_dapplied_perm_space():
     
     assert (0, 4, 2, 3, 1) in dapplied_perm_space
     assert (0, 4, 'ooga booga', 2, 3, 1) not in dapplied_perm_space
-    assert infinite_pure_perm_space[7] not in rapplied_perm_space
+    assert infinite_pure_perm_space[7] not in dapplied_perm_space
     
     dapplied_perm = dapplied_perm_space[-1]
     assert dapplied_perm in dapplied_perm_space
@@ -264,8 +264,10 @@ def test_degreed_perm_space():
     assert funky_perm_space.domain == 'travels'
     assert funky_perm_space.canonical_slice.start == 2
     
-    assert funky_perm_space.undegreed.get_degreed(2)[0] not in funky_perm_space
-    assert funky_perm_space.get_fixed({'t': 'i', 'v': 'g',}) == funky_perm_space
+    assert funky_perm_space.unsliced.undegreed.get_degreed(2)[0] \
+                                                        not in funky_perm_space
+    assert funky_perm_space.unsliced.get_fixed({'t': 'i', 'v': 'g',}) \
+                                  [funky_perm_space.slice_] == funky_perm_space
     
     for i, perm in enumerate(funky_perm_space):
         assert perm.is_dapplied
@@ -327,8 +329,8 @@ def test_degreed_perm_space():
     
     assert pickle.loads(pickle.dumps(funky_perm_space)) == funky_perm_space
     assert funky_perm_space != \
-                      pickle.loads(pickle.dumps(funky_perm_space.unfixed)) == \
-                                                       funky_perm_space.unfixed
+             pickle.loads(pickle.dumps(funky_perm_space.unsliced.unfixed)) == \
+                                              funky_perm_space.unsliced.unfixed
     
     
     
