-

cool-RR · cool-RR · commit 725befc61bcf · 2014-09-18T16:48:33.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm_space.py b/source_py3/python_toolbox/combi/perm_space.py
@@ -668,10 +668,9 @@ def unpartialled(self):
             )
             
         return PermSpace(
-            self.sequence_length, domain=self.domain,
-            n_elements=self.sequence_length, fixed_map=self.fixed_map,
-            degrees=self.degrees, slice_=self.canonical_slice,
-            is_combination=self.is_combination
+            self.sequence, n_elements=self.sequence_length,
+            fixed_map=self.fixed_map, degrees=self.degrees,
+            slice_=self.canonical_slice, is_combination=self.is_combination
         )
     
     unsliced = caching.CachedProperty(
@@ -695,8 +694,8 @@ def uncombinationed(self):
                             "uncombinationed, because the number of items "
                             "would be different. Use `.unsliced` first.")
         return PermSpace(
-            self.sequence_length, domain=self.domain, fixed_map=self.fixed_map,
-            degrees=self.degrees, slice_=self.canonical_slice,
+            self.sequence, domain=self.domain, fixed_map=self.fixed_map,
+            degrees=self.degrees, slice_=None,
             n_elements=self.n_elements, is_combination=False
         )
       
@@ -732,12 +731,13 @@ def _free_values_purified_perm_space(self):
     def get_partialled(self, n_elements):
         '''Get a partialled version of this `PermSpace`.'''
         if self.is_sliced:
-            raise Exception("Can't get partial of sliced `PermSpace` directly, "
-                            "because the number of items would "
-                            "be different. Use `.unsliced` first.")
+            raise Exception(
+                "Can't get partial of sliced `PermSpace` directly, because the "
+                "number of items would be different. Use `.unsliced` first."
+            )
         return PermSpace(
             self.sequence, domain=self.domain, fixed_map=self.fixed_map,
-            degrees=self.degrees, slice_=self.canonical_slice,
+            degrees=self.degrees, slice_=None,
             is_combination=self.is_combination, n_elements=n_elements
         )
         
diff --git a/source_py3/test_python_toolbox/test_combi/test_comb_space.py b/source_py3/test_python_toolbox/test_combi/test_comb_space.py
@@ -30,7 +30,8 @@ def test():
     assert comb_space.undapplied == comb_space
     assert comb_space.unrapplied == CombSpace(6, 2)
     assert comb_space.unpartialled == CombSpace('dumber', 6)
-    assert comb_space.uncombinationed == PermSpace('dumber', n_elements=6)
+    assert comb_space.unpartialled.get_partialled(5) == CombSpace('dumber', 5)
+    assert comb_space.uncombinationed == PermSpace('dumber', n_elements=2)
     assert comb_space.undegreed == comb_space
     assert comb_space.unrapplied.get_rapplied(range(10, 70, 10)) == \
                                                 CombSpace(range(10, 70, 10), 2)
@@ -40,8 +41,8 @@ def test():
         comb_space.get_degreed(3)
     assert comb_space.unfixed == comb_space
     assert not comb_space.fixed_indices
-    assert comb_space.free_indices == comb_space.free_keys == (0, 1)
-    assert comb_space.free_values == tuple('dumber')
+    assert comb_space.free_indices == comb_space.free_keys == range(2)
+    assert comb_space.free_values == 'dumber'
     
     
     
