-

cool-RR · cool-RR · commit 8b5753a35085 · 2014-10-01T02:40:26.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -793,6 +793,9 @@ def index(self, perm):
             
             
         elif self.is_combination:
+            if perm.is_rapplied or perm.is_dapplied:
+                return self.unrapplied.undapplied.index(perm)
+            
             processed_perm_sequence = tuple(
                 self.sequence_length - 1 -
                                      item for item in perm._perm_sequence[::-1]
diff --git a/source_py3/test_python_toolbox/test_combi/test_exhaustive.py b/source_py3/test_python_toolbox/test_combi/test_exhaustive.py
@@ -170,11 +170,8 @@ def _check_variation_selection(variation_selection):
     )
     
     if perm_space.length >= 2:
-        assert perm_space[-1] >= perm_space[0]
-        assert perm_space[-1] > perm_space[0]
-        assert perm_space[0] <= perm_space[-1]
-        assert perm_space[0] < perm_space[-1]
-        assert perm_space[0] != perm_space[-1]
+        assert perm_space.index(perm_space[-1]) > \
+                                                perm_space.index(perm_space[0])
         
         
     if variation_selection.is_partial:
