-

cool-RR · cool-RR · commit 1cf601de473f · 2014-09-21T01:37:34.000+03:00
diff --git a/source_py3/python_toolbox/combi/perm.py b/source_py3/python_toolbox/combi/perm.py
@@ -213,13 +213,6 @@ def number(self):
                   self.just_dapplied_rapplied_perm_space.n_unused_elements)
             
     
-    @caching.CachedProperty
-    def _net_length(self):
-        self._perm_sequence # Calculating this would calculate `_net_length` as
-                            # a side-effect.
-        return self._net_length
-        
-    
     @caching.CachedProperty
     def _perm_sequence(self):
         assert (0 <= self.number < 
@@ -233,7 +226,6 @@ def _perm_sequence(self):
             factoradic_number = factoradic_number[
                 :-self.just_dapplied_rapplied_perm_space.n_unused_elements
             ]
-        self._net_length = len(factoradic_number)
         unused_numbers = list(self.just_dapplied_rapplied_perm_space.sequence)
         result = tuple(unused_numbers.pop(factoradic_digit) for
                                          factoradic_digit in factoradic_number)
@@ -315,7 +307,10 @@ def rapply(self, sequence, result_type=None):
         
         permed_generator = (sequence[i] for i in self)
         if result_type is not None:
-            return result_type(permed_generator)
+            if result_type is str:
+                return ''.join(permed_generator)
+            else:
+                return result_type(permed_generator)
         elif isinstance(sequence, Perm):
             return Perm(permed_generator,
                         sequence.just_dapplied_rapplied_perm_space)
diff --git a/source_py3/python_toolbox/sequence_tools/misc.py b/source_py3/python_toolbox/sequence_tools/misc.py
@@ -418,6 +418,15 @@ def get_length(sequence):
         
         
 def divide_to_slices(sequence, n_slices):
+    '''
+    Divide a sequence to slices.
+    
+    Example:
+    
+        >>> divide_to_slices(range(10), 3)
+        [range(0, 4), range(4, 7), range(7, 10)]
+        
+    '''
     assert isinstance(n_slices, numbers.Integral)
     assert n_slices >= 1
     
diff --git a/source_py3/test_python_toolbox/test_combi/test_perm_space.py b/source_py3/test_python_toolbox/test_combi/test_perm_space.py
@@ -38,6 +38,14 @@ def test_perm_spaces():
     some_perm = pure_0a[7]
     last_perm = pure_0a[-1]
     
+    assert first_perm.index(2) == 2
+    assert first_perm.index(0) == 0
+    with cute_testing.RaiseAssertor(ValueError): first_perm.index(5)
+    
+    assert last_perm.rapply('meow') == 'woem'
+    assert last_perm.rapply('meow', str) == 'woem'
+    assert last_perm.rapply('meow', tuple) == tuple('woem')
+    
     with cute_testing.RaiseAssertor(IndexError): pure_0a[- pure_0a.length - 1]
     with cute_testing.RaiseAssertor(IndexError): pure_0a[- pure_0a.length - 2]
     with cute_testing.RaiseAssertor(IndexError): pure_0a[- pure_0a.length - 30]
@@ -159,6 +167,7 @@ def test_perm_spaces():
     assert pickle.loads(pickle.dumps(pure_0b[2])) == pure_0c[2]
     assert pickle.loads(pickle.dumps(pure_0b[3])) != pure_0b[4]
     
+    
 def test_fixed_perm_space():
     pure_perm_space = PermSpace(5)
     small_fixed_perm_space = PermSpace(5, fixed_map={0: 0, 2: 2, 4: 4,})
@@ -252,6 +261,8 @@ def test_dapplied_perm_space():
     assert repr(dapplied_perm) == \
          '''<Perm: (119 / 120) ('g', 'r', 'o', 'w', 'l') => (4, 3, 2, 1, 0)>'''
     
+    assert dapplied_perm.index(4) == 'g'
+    
     assert dapplied_perm.as_dictoid['g'] == 4
     assert dapplied_perm.items[0] == ('g', 4)
     
diff --git a/source_py3/test_python_toolbox/test_sequence_tools/test_divide_to_slices.py b/source_py3/test_python_toolbox/test_sequence_tools/test_divide_to_slices.py
@@ -0,0 +1,9 @@
+# Copyright 2009-2014 Ram Rachum.
+# This program is distributed under the MIT license.
+
+from python_toolbox.sequence_tools import divide_to_slices
+
+
+def test():
+    assert divide_to_slices(range(10), 3) == \
+                                       [range(0, 4), range(4, 7), range(7, 10)]
