-

cool-RR · cool-RR · commit 1bf57f47810d · 2014-10-02T01:42:03.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -638,7 +638,8 @@ class O: length = 0
                         break
                     else:
                         wip_i -= candidate_sub_perm_space.length
-                        shit_set.add(wip_perm_sequence_dict[j])
+                        if self.is_combination:
+                            shit_set.add(wip_perm_sequence_dict[j])
                         del wip_perm_sequence_dict[j]
                 else:
                     raise RuntimeError
@@ -782,29 +783,59 @@ def index(self, perm):
             wip_perm_number = 0
             unused_values = list(self.sequence)
             perm_sequence_list = list(perm._perm_sequence)
+            shit_set = set()
             for i, value in enumerate(perm):
                 if i in self.fixed_map:
                     if self.fixed_map[i] == value:
                         unused_values.remove(value)
                         continue
                     else:
                         raise ValueError
-                lower_values = [thing for thing in
-                                nifty_collections.OrderedSet(unused_values)
-                                if unused_values.index(thing) <
-                                                    unused_values.index(value)]
+                lower_values = [
+                    thing for thing in
+                    nifty_collections.OrderedSet(unused_values) if
+                    unused_values.index(thing) < unused_values.index(value) and
+                                                          thing not in shit_set
+                ]
                 unused_values.remove(value)
                 for lower_value in lower_values:
                     temp_fixed_map = dict(
                             enumerate(perm_sequence_list[:i] + [lower_value])
                         )
                     temp_fixed_map.update(self.fixed_map)
-                    wip_perm_number += PermSpace(
-                        self.sequence,
-                        fixed_map=temp_fixed_map,
-                        n_elements=self.n_elements,
-                        is_combination=self.is_combination
-                    ).length
+                    
+                    
+                    head = []
+                    n_elements_to_use = self.n_elements
+                    for k in sequence_tools.CuteRange(infinity):
+                        try:
+                            head.append(temp_fixed_map[k])
+                        except KeyError:
+                            break
+                        else:
+                            del temp_fixed_map[k]
+                            n_elements_to_use -= 1
+                    sequence_to_use = list(self.sequence)
+                    for item in head:
+                        if self.is_combination:
+                            sequence_to_use = sequence_to_use[
+                                sequence_to_use.index(item) + 1:
+                            ]
+                        else:
+                            sequence_to_use.remove(item)
+
+                    sequence_to_use = [x for x in sequence_to_use if x not in shit_set]
+                    
+                    if len(sequence_to_use) >= n_elements_to_use:
+                        wip_perm_number += PermSpace(
+                            sequence_to_use,
+                            fixed_map=temp_fixed_map,
+                            n_elements=n_elements_to_use,
+                            is_combination=self.is_combination
+                        ).length
+                    if self.is_combination:
+                        shit_set.add(lower_value)
+                    
                 
             perm_number = wip_perm_number
             
diff --git a/source_py3/python_toolbox/math_tools/sequences.py b/source_py3/python_toolbox/math_tools/sequences.py
@@ -122,7 +122,9 @@ def catshit(k, recurrence_counter):
     if not isinstance(recurrence_counter, nifty_collections.FrozenCounterCounter):
         recurrence_counter = \
                        nifty_collections.FrozenCounterCounter(recurrence_counter)
-    if k == 1:
+    if k == 0:
+        return 1
+    elif k == 1:
         assert recurrence_counter
         # (Works because `FrozenCrateCounter` has a functioning `__bool__`,
         # unlike Python's `Counter`.)
diff --git a/source_py3/test_python_toolbox/test_combi/test_exhaustive.py b/source_py3/test_python_toolbox/test_combi/test_exhaustive.py
@@ -118,12 +118,12 @@ def _check_variation_selection(variation_selection):
         # Can't even test this illogical clash.
         return 
         
-    #blocktodo remove
-    if not (variation_selection.is_recurrent and variation_selection.is_combination):
-        return
-    #blocktodo remove
-    if variation_selection.number != 240:
-        return
+    # #blocktodo remove
+    # if not (variation_selection.is_recurrent and variation_selection.is_combination):
+        # return
+    # #blocktodo remove
+    # if variation_selection.number != 192:
+        # return
     
     iterable_or_length = (
         'abracab' if variation_selection.is_recurrent else
@@ -195,9 +195,9 @@ def _check_variation_selection(variation_selection):
     
     assert perm_space.length == len(brute_perm_space_tuple)
     
-    #blocktodo remove
-    tuple(perm_space)
-    
+    if perm_space.length:
+        assert tuple(perm_space[-1]) == brute_perm_space_tuple[-1]
+               
     if perm_space.length >= 2:
         assert perm_space.index(perm_space[-1]) > \
                                                 perm_space.index(perm_space[0])
