-

cool-RR · cool-RR · commit 96fafc18ee0d · 2014-10-04T20:35:04.000+03:00
diff --git a/source_py3/python_toolbox/combi/perming/perm_space.py b/source_py3/python_toolbox/combi/perming/perm_space.py
@@ -593,19 +593,15 @@ def __getitem__(self, i):
                     
                     )):
                     wip_perm_sequence_dict[j] = unused_value
-                    sequence = [item for item in self.sequence
-                                                       if item not in shit_set]
-                    if any(value in shit_set for value
-                                           in wip_perm_sequence_dict.values()):
-                        candidate_sub_perm_space_length = 0
-                    else:
-                        candidate_sub_perm_space_length = \
-                                              PermSpace._create_with_cut_prefix(
-                            sequence,
-                            n_elements=self.n_elements,
-                            fixed_map=wip_perm_sequence_dict,
-                            is_combination=self.is_combination
-                        ).length
+                    
+                    candidate_sub_perm_space_length = \
+                                             PermSpace._create_with_cut_prefix(
+                        self.sequence,
+                        n_elements=self.n_elements,
+                        fixed_map=wip_perm_sequence_dict,
+                        is_combination=self.is_combination,
+                        shit_set=shit_set
+                    ).length
                     
                     if wip_i < candidate_sub_perm_space_length:
                         available_values.remove(unused_value)
@@ -920,7 +916,7 @@ def _coerce_perm(self, perm):
     @classmethod
     def _create_with_cut_prefix(cls, sequence, domain=None, *,
         n_elements=None, fixed_map=None, degrees=None, is_combination=False,
-                                                                  slice_=None):
+                                            slice_=None, shit_set=frozenset()):
         
         # Tricky thing here: Trying to put as much as we can in a
         # sequence head that'll shorten the sequence we'll give to
@@ -952,9 +948,9 @@ def _create_with_cut_prefix(cls, sequence, domain=None, *,
                 sequence[sequence.index(item)] = misc.MISSING_ELEMENT
                 # More efficient than removing the element, we filter these out
                 # later.
-        if not is_combination:
-            sequence = [item for item in sequence
-                                         if (item is not misc.MISSING_ELEMENT)]
+        
+        shit_set = {misc.MISSING_ELEMENT} | shit_set
+        sequence = [item for item in sequence if item not in shit_set]
                 
         fixed_map = {key - len(prefix): value
                                            for key, value in fixed_map.items()}
