-

cool-RR · cool-RR · commit b72e576fa9cd · 2014-09-30T18:58:48.000+03:00
diff --git a/source_py3/python_toolbox/combi/_variation_removing_mixin.py b/source_py3/python_toolbox/combi/_variation_removing_mixin.py
@@ -30,7 +30,7 @@ def unrapplied(self):
             fixed_map={key: self.sequence.index(value) for
                        key, value in self.fixed_map.items()},
             degrees=self.degrees, n_elements=self.n_elements,
-            is_combination=self.is_combination
+            slice_=self.canonical_slice, is_combination=self.is_combination
         )
     
     @caching.CachedProperty
diff --git a/source_py3/python_toolbox/combi/perm.py b/source_py3/python_toolbox/combi/perm.py
@@ -187,12 +187,13 @@ def number(self):
         if self.is_dapplied:
             return self.undapplied.number
         
+        if self.is_recurrent:
+            return self.nominal_perm_space.index(self)
+        
         factoradic_number = []
         unused_values = list(self.nominal_perm_space.sequence)
         for i, value in enumerate(self):
-            index_of_current_number = \
-                nifty_collections.OrderedSet(unused_values).index(value) if \
-                              self.is_recurrent else unused_values.index(value)
+            index_of_current_number = unused_values.index(value)
             factoradic_number.append(index_of_current_number)
             unused_values.remove(value)
         return math_tools.from_factoradic(
diff --git a/source_py3/test_python_toolbox/test_combi/test_exhaustive.py b/source_py3/test_python_toolbox/test_combi/test_exhaustive.py
@@ -4,6 +4,7 @@
 import pickle
 import itertools
 import collections
+import ast
 
 import nose
 
@@ -256,7 +257,8 @@ def _check_variation_selection(variation_selection):
         # Give me your unsliced, your undegreed, your unfixed.
         
         if not variation_selection.is_fixed and \
-                                            not variation_selection.is_degreed:
+                                       not variation_selection.is_degreed and \
+                                          not variation_selection.is_recurrent:
             assert perm_space.index(perm) == i
             if not variation_selection.is_sliced:
                 assert perm.number == i
@@ -331,6 +333,17 @@ def _check_variation_selection(variation_selection):
         #                                                                     #
         ### Finished testing neighbors. #######################################
         
+        perm_repr = repr(perm)
+        perm_number_string, big_number_string = perm_repr.split(')', 1)[0] \
+                                                 .split('(', 1)[1].split(' / ')
+        perm_number = ast.literal_eval(perm_number_string)
+        big_number = (math.factorial(ast.literal_eval(big_number_string[:-1]))
+                      if big_number_string.endswith('!')
+                      else ast.literal_eval(big_number_string))
+        
+        assert (0 <= perm_number == perm.number <= big_number ==
+                                                perm.nominal_perm_space.length)
+        
     
 def test():
     yield from ((_check_variation_selection, variation_selection) for

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ def unrapplied(self):`
`30`	`30`	`fixed_map={key: self.sequence.index(value) for`
`31`	`31`	`key, value in self.fixed_map.items()},`
`32`	`32`	`degrees=self.degrees, n_elements=self.n_elements,`
`33`		`- is_combination=self.is_combination`
	`33`	`+ slice_=self.canonical_slice, is_combination=self.is_combination`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`@caching.CachedProperty`