-

cool-RR · cool-RR · commit 114934334310 · 2014-09-24T02:40:06.000+03:00
diff --git a/source_py2/python_toolbox/combi/perm_space.py b/source_py2/python_toolbox/combi/perm_space.py
@@ -497,17 +497,17 @@ def __getitem__(self, i):
                                               candidate_fixed_perm_space_length
                     else:
                         raise RuntimeError
-                return self.perm_type((wip_perm_sequence_dict[i] for i in
+                return self.perm_type((wip_perm_sequence_dict[k] for k in
                                        self.domain), self)
             elif self.is_fixed:
                 free_values_perm = self._free_values_unsliced_perm_space[i]
                 free_values_perm_iterator = iter(free_values_perm)
                 return self.perm_type(
                     tuple(
-                        (self._undapplied_fixed_map[i] if
-                         (i in self.fixed_indices) else
+                        (self._undapplied_fixed_map[m] if
+                         (m in self.fixed_indices) else
                          next(free_values_perm_iterator))
-                                           for i in range(self.sequence_length)
+                        for m in range(self.sequence_length)
                     ),
                     self
                 )
diff --git a/source_py2/python_toolbox/sequence_tools/cute_range.py b/source_py2/python_toolbox/sequence_tools/cute_range.py
@@ -221,7 +221,7 @@ def index(self, i):
         else:
             distance = i - self.start
             if distance == 0 and self:
-                return True
+                return 0
             if math_tools.get_sign(distance) != math_tools.get_sign(self.step):
                 raise ValueError
             index, remainder = math_tools.cute_divmod(distance, self.step)
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -477,17 +477,17 @@ def __getitem__(self, i):
                                               candidate_fixed_perm_space_length
                     else:
                         raise RuntimeError
-                return self.perm_type((wip_perm_sequence_dict[i] for i in
+                return self.perm_type((wip_perm_sequence_dict[k] for k in
                                        self.domain), self)
             elif self.is_fixed:
                 free_values_perm = self._free_values_unsliced_perm_space[i]
                 free_values_perm_iterator = iter(free_values_perm)
                 return self.perm_type(
                     tuple(
-                        (self._undapplied_fixed_map[i] if
-                         (i in self.fixed_indices) else
+                        (self._undapplied_fixed_map[m] if
+                         (m in self.fixed_indices) else
                          next(free_values_perm_iterator))
-                                           for i in range(self.sequence_length)
+                                           for m in range(self.sequence_length)
                     ),
                     self
                 )
diff --git a/source_py3/python_toolbox/sequence_tools/cute_range.py b/source_py3/python_toolbox/sequence_tools/cute_range.py
@@ -215,7 +215,7 @@ def index(self, i):
         else:
             distance = i - self.start
             if distance == 0 and self:
-                return True
+                return 0
             if math_tools.get_sign(distance) != math_tools.get_sign(self.step):
                 raise ValueError
             index, remainder = math_tools.cute_divmod(distance, self.step)
