-

cool-RR · cool-RR · commit 216699c09dfd · 2014-10-01T18:06:58.000+03:00
diff --git a/source_py3/python_toolbox/combi/comb_space.py b/source_py3/python_toolbox/combi/comb_space.py
@@ -10,13 +10,12 @@ class CombSpace(PermSpace):
     
     Every item in a `CombSpace` is a `Comb`.
     '''
-    def __init__(self, iterable_or_length, n_elements, fixed_map=None, 
-                 slice_=None, _domain_for_checking=None,
-                 _degrees_for_checking=None):
+    def __init__(self, iterable_or_length, n_elements, slice_=None,
+                 _domain_for_checking=None, _degrees_for_checking=None):
         PermSpace.__init__(
             self, iterable_or_length=iterable_or_length, n_elements=n_elements,
-            fixed_map=fixed_map, is_combination=True, slice_=slice_,
-            domain=_domain_for_checking, degrees=_degrees_for_checking
+            is_combination=True, slice_=slice_, domain=_domain_for_checking,
+            degrees=_degrees_for_checking
         )
         
         
@@ -26,12 +25,11 @@ def __repr__(self):
             sequence_repr = \
                       ''.join((sequence_repr[:35], ' ... ', sequence_repr[-1]))
             
-        return '<%s: %s%s%s>%s' % (
+        return '<%s: %s%s>%s' % (
             type(self).__name__,
             sequence_repr,
             (', n_elements=%s' % (self.n_elements,)) if self.is_partial
                                                                        else '',
-            (', fixed_map=%s' % (self.fixed_map,)) if self.is_fixed else '',
             ('[%s:%s]' % (self.slice_.start, self.slice_.stop)) if
                                                          self.is_sliced else ''
         )
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -46,15 +46,14 @@ def __call__(cls, *args, **kwargs):
             from .comb_space import CombSpace
             arguments_profile = python_toolbox.arguments_profiling. \
                     ArgumentsProfile(PermSpace.__init__, None, *args, **kwargs)
-            # if arguments_profile.get('fixed_map', None):
-                # raise UnallowedVariationSelectionException(
-                    # {variations.Variation.FIXED: True,
-                     # variations.Variation.COMBINATION: True,}
-                # )
+            if arguments_profile.get('fixed_map', None):
+                raise UnallowedVariationSelectionException(
+                    {variations.Variation.FIXED: True,
+                     variations.Variation.COMBINATION: True,}
+                )
             return super(PermSpaceType, CombSpace).__call__(
                 iterable_or_length=arguments_profile['iterable_or_length'], 
                 n_elements=arguments_profile['n_elements'],
-                fixed_map=arguments_profile['fixed_map'],
                 slice_=arguments_profile['slice_'],
                 _domain_for_checking=arguments_profile['domain'],
                 _degrees_for_checking=arguments_profile['degrees'],
@@ -582,12 +581,37 @@ def __getitem__(self, i):
                     (value in reserved_values and available_values.count(value)
                                             == reserved_values.count(value)))):
                     wip_perm_sequence_dict[j] = unused_value
+                    
+                    ###########################################################
+                    #                                                         #
+                    # Tricky thing here: Trying to put as much as we can in a
+                    # sequence head that'll shorten the sequence we'll give to
+                    # the candidate space instead of using a fixed map, if
+                    # possible. This is crucial for `CombSpace` which can't use
+                    # `fixed_map`.
+                    head = []
+                    fixed_map_to_use = dict(wip_perm_sequence_dict)
+                    n_elements_to_use = self.n_elements
+                    for i in sequence_tools.CuteRange(infinity):
+                        try:
+                            head.append(wip_perm_sequence_dict[i])
+                        except KeyError:
+                            break
+                        else:
+                            del wip_perm_sequence_dict[i]
+                            n_elements_to_use -= 1
+                    sequence_to_use = list(self.sequence)
+                    for item in head:
+                        sequence_to_use.remove(item)
+                    
                     candidate_sub_perm_space = PermSpace(
-                        self.sequence,
-                        n_elements=self.n_elements,
-                        fixed_map=wip_perm_sequence_dict, 
+                        sequence_to_use,
+                        n_elements=n_elements_to_use,
+                        fixed_map=fixed_map_to_use, 
                         is_combination=self.is_combination
                     )
+                    #                                                         #
+                    ###########################################################
                     
                     if wip_i < candidate_sub_perm_space.length:
                         available_values.remove(unused_value)
diff --git a/source_py3/python_toolbox/combi/variations.py b/source_py3/python_toolbox/combi/variations.py
@@ -43,7 +43,7 @@ class Variation(nifty_collections.CuteEnum):
     {Variation.DEGREED: True, Variation.COMBINATION: True,},
     {Variation.DEGREED: True, Variation.PARTIAL: True,},
     {Variation.DEGREED: True, Variation.RECURRENT: True,},
-    # {Variation.COMBINATION: True, Variation.FIXED: True,},
+    {Variation.COMBINATION: True, Variation.FIXED: True,},
     {Variation.RAPPLIED: False, Variation.RECURRENT: True,},
 )
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class Variation(nifty_collections.CuteEnum):`
`43`	`43`	`{Variation.DEGREED: True, Variation.COMBINATION: True,},`
`44`	`44`	`{Variation.DEGREED: True, Variation.PARTIAL: True,},`
`45`	`45`	`{Variation.DEGREED: True, Variation.RECURRENT: True,},`
`46`		`- # {Variation.COMBINATION: True, Variation.FIXED: True,},`
	`46`	`+ {Variation.COMBINATION: True, Variation.FIXED: True,},`
`47`	`47`	`{Variation.RAPPLIED: False, Variation.RECURRENT: True,},`
`48`	`48`	`)`
`49`	`49`