-

cool-RR · cool-RR · commit e672f4741b1e · 2014-11-03T13:22:14.000+02:00
diff --git a/source_py2/python_toolbox/combi/perming/perm.py b/source_py2/python_toolbox/combi/perming/perm.py
@@ -403,7 +403,7 @@ def get_neighbors(self, degrees=(1,), perm_space=None):
         if perm_space is None:
             perm_space = self.nominal_perm_space
         return MapSpace(
-            perm_space._coerce_perm,
+            perm_space.coerce_perm,
             nifty_collections.LazyTuple(
                 tuple(perm) for perm in PermSpace(
                     self._perm_sequence,
diff --git a/source_py2/python_toolbox/combi/perming/perm_space.py b/source_py2/python_toolbox/combi/perming/perm_space.py
@@ -557,6 +557,7 @@ def __getitem__(self, i):
         elif self.is_dapplied:
             return self.perm_type(self.undapplied[i], perm_space=self)
             
+        #######################################################################
         elif self.is_degreed:
             if self.is_rapplied:
                 assert not self.is_recurrent and \
@@ -628,6 +629,8 @@ def __getitem__(self, i):
             assert wip_i == 0
             return self.perm_type((wip_perm_sequence_dict[k] for k in
                                    self.domain), self)
+        
+        #######################################################################
         elif self.is_recurrent:
             assert not self.is_dapplied and not self.is_degreed and \
                                                              not self.is_sliced
@@ -674,6 +677,7 @@ def __getitem__(self, i):
                 self
             )
         
+        #######################################################################
         elif self.is_fixed:
             free_values_perm = self._free_values_unsliced_perm_space[i]
             free_values_perm_iterator = iter(free_values_perm)
@@ -687,6 +691,7 @@ def __getitem__(self, i):
                 self
             )
         
+        #######################################################################
         elif self.is_combination:
             wip_number = self.length - 1 - i
             wip_perm_sequence = []
@@ -706,6 +711,7 @@ def __getitem__(self, i):
             return self.perm_type(result, self)
 
         
+        #######################################################################
         else:
             factoradic_number = math_tools.to_factoradic(
                 i * math.factorial(
@@ -781,7 +787,9 @@ def index(self, perm):
         # At this point we know the permutation contains the correct items, and
         # has the correct degree.
         if perm.is_dapplied: return self.undapplied.index(perm.undapplied)
-        if self.is_degreed:
+        
+        #######################################################################
+        elif self.is_degreed:
             if perm.is_rapplied: return self.unrapplied.index(perm.unrapplied)
             wip_perm_number = 0
             wip_perm_sequence_dict = dict(self.fixed_map)
@@ -803,6 +811,7 @@ def index(self, perm):
                 
             perm_number = wip_perm_number
             
+        #######################################################################
         elif self.is_recurrent:
             assert not self.is_degreed and not self.is_dapplied
 
@@ -850,6 +859,7 @@ def index(self, perm):
                 
             perm_number = wip_perm_number
             
+        #######################################################################
         elif self.is_fixed:
             assert not self.is_degreed and not self.is_recurrent
             free_values_perm_sequence = []
@@ -868,6 +878,7 @@ def index(self, perm):
             )
             
             
+        #######################################################################
         elif self.is_combination:
             if perm.is_rapplied:
                 return self.unrapplied.index(perm.unrapplied)
@@ -889,8 +900,8 @@ def index(self, perm):
                 0
             )
               
+        #######################################################################
         else:
-            
             factoradic_number = []
             unused_values = list(self.sequence)
             for i, value in enumerate(perm._perm_sequence):
@@ -903,6 +914,8 @@ def index(self, perm):
             ) // math.factorial(self.n_unused_elements)
             
             
+        #######################################################################
+        
         if perm_number not in self.canonical_slice:
             raise ValueError
             
@@ -943,7 +956,7 @@ def __reduce__(self, *args, **kwargs):
         return super(PermSpace, self).__reduce__(*args, **kwargs)
         
         
-    def _coerce_perm(self, perm):
+    def coerce_perm(self, perm):
         '''Coerce `perm` to be a permutation of this space.'''
         return self.perm_type(perm, self)
     
diff --git a/source_py2/test_python_toolbox/test_nifty_collections/test_lazy_tuple/test_frozen_dict.py b/source_py2/test_python_toolbox/test_nifty_collections/test_lazy_tuple/test_frozen_dict.py
