-

cool-RR · cool-RR · commit 8f5aee7650d0 · 2014-10-01T20:44:04.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -571,7 +571,7 @@ def __getitem__(self, i):
             reserved_values = list(self.fixed_map.values())
             wip_perm_sequence_dict = dict(self.fixed_map)
             wip_i = i
-            for j in range(self.sequence_length):
+            for j in range(self.n_elements):
                 if j in self.fixed_map:
                     available_values.remove(self.fixed_map[j])
                     reserved_values.remove(self.fixed_map[j])
@@ -628,8 +628,7 @@ def __getitem__(self, i):
                         wip_i -= candidate_sub_perm_space.length
                         del wip_perm_sequence_dict[j]
                 else:
-                    if len(wip_perm_sequence_dict) < self.n_elements:
-                        raise RuntimeError
+                    raise RuntimeError
             assert wip_i == 0
             return self.perm_type(
                 dict_tools.get_list(wip_perm_sequence_dict, self.domain),
@@ -789,7 +788,9 @@ def index(self, perm):
                     temp_fixed_map.update(self.fixed_map)
                     wip_perm_number += PermSpace(
                         self.sequence,
-                        fixed_map=temp_fixed_map
+                        fixed_map=temp_fixed_map,
+                        n_elements=self.n_elements,
+                        is_combination=self.is_combination
                     ).length
                 
             perm_number = wip_perm_number
diff --git a/source_py3/test_python_toolbox/test_combi/test_exhaustive.py b/source_py3/test_python_toolbox/test_combi/test_exhaustive.py
@@ -286,9 +286,12 @@ def _check_variation_selection(variation_selection):
             
         perm_set = set(perm)
         if variation_selection.is_partial:
-            assert perm_set < sequence_set
-            assert len(perm_set) == 5
             assert len(perm) == 5
+            if variation_selection.is_recurrent:
+                assert perm_set <= sequence_set
+            else:
+                assert perm_set < sequence_set
+                assert len(perm_set) == 5
         else:
             assert perm_set == sequence_set
             assert len(perm) == 7
