-

cool-RR · cool-RR · commit 0491e8f1baf5 · 2014-10-04T17:46:23.000+03:00
diff --git a/source_py3/python_toolbox/combi/perming/calculating_length.py b/source_py3/python_toolbox/combi/perming/calculating_length.py
@@ -2,15 +2,17 @@
 import collections
 import itertools
 
+from python_toolbox import nifty_collections
+from python_toolbox import cute_iter_tools
+
 infinity = float('inf')
 
+
 ###############################################################################
 
 _length_of_recurrent_perm_space_cache = {}
 
 def calculate_length_of_recurrent_perm_space(k, ftt):
-    from python_toolbox import nifty_collections
-    from python_toolbox import cute_iter_tools
     cache = _length_of_recurrent_perm_space_cache
     if not isinstance(ftt, nifty_collections.FrozenTallyTally):
         ftt = nifty_collections.FrozenTallyTally(ftt)
@@ -59,11 +61,6 @@ def calculate_length_of_recurrent_perm_space(k, ftt):
 _length_of_recurrent_comb_space_cache = {}
 
 def calculate_length_of_recurrent_comb_space(k, ftt):
-    '''
-    blocktodo gotta properly name these two sons of bitches
-    '''
-    from python_toolbox import nifty_collections
-    from python_toolbox import cute_iter_tools
     cache = _length_of_recurrent_comb_space_cache
     if not isinstance(ftt, nifty_collections.FrozenTallyTally):
         ftt = nifty_collections.FrozenTallyTally(ftt)
diff --git a/source_py3/python_toolbox/combi/perming/perm_space.py b/source_py3/python_toolbox/combi/perming/perm_space.py
@@ -25,6 +25,7 @@
 
 from .. import misc
 from . import variations
+from .calculating_length import * 
 from .variations import UnallowedVariationSelectionException
 from ._variation_removing_mixin import _VariationRemovingMixin
 from ._variation_adding_mixin import _VariationAddingMixin
@@ -377,7 +378,7 @@ def _unsliced_length(self):
         elif self.is_fixed:
             assert not self.is_degreed and not self.is_combination
             if self.is_recurrent:
-                return math_tools.calculate_length_of_recurrent_perm_space(
+                return calculate_length_of_recurrent_perm_space(
                     self.n_elements - len(self.fixed_map),
                     nifty_collections.FrozenTallyTally(
                         collections.Counter(self.free_values).values()
@@ -394,12 +395,12 @@ def _unsliced_length(self):
             assert not self.is_degreed and not self.is_fixed
             if self.is_recurrent:
                 if self.is_combination:
-                    return math_tools.calculate_length_of_recurrent_comb_space(
+                    return calculate_length_of_recurrent_comb_space(
                         self.n_elements,
                         self._frozen_tally_tally
                     )
                 else:
-                    return math_tools.calculate_length_of_recurrent_perm_space(
+                    return calculate_length_of_recurrent_perm_space(
                         self.n_elements,
                         self._frozen_tally_tally
                     )
diff --git a/source_py3/test_python_toolbox/test_combi/test_calculating_length.py b/source_py3/test_python_toolbox/test_combi/test_calculating_length.py
@@ -0,0 +1,13 @@
+from python_toolbox.combi.perming.calculating_length import * 
+
+def test_recurrent_perm_space_length():
+    assert calculate_length_of_recurrent_perm_space(3, (3, 1, 1)) == 13
+    assert calculate_length_of_recurrent_perm_space(2, (3, 2, 2, 1)) == 15
+    assert calculate_length_of_recurrent_perm_space(3, (3, 2, 2, 1)) == 52
+    
+
+def test_recurrent_comb_space_length():
+    assert calculate_length_of_recurrent_comb_space(3, (3, 1, 1)) == 4
+    assert calculate_length_of_recurrent_comb_space(2, (3, 2, 2, 1)) == 9
+    assert calculate_length_of_recurrent_comb_space(3, (3, 2, 2, 1)) == 14
+    
diff --git a/source_py3/test_python_toolbox/test_math_tools/test_sequences.py b/source_py3/test_python_toolbox/test_math_tools/test_sequences.py
@@ -19,14 +19,3 @@ def test_abs_stirling():
     # number was verified with Wolfram Mathematica.
 
 
-def test_recurrent_perm_space_length():
-    assert calculate_length_of_recurrent_perm_space(3, (3, 1, 1)) == 13
-    assert calculate_length_of_recurrent_perm_space(2, (3, 2, 2, 1)) == 15
-    assert calculate_length_of_recurrent_perm_space(3, (3, 2, 2, 1)) == 52
-    
-
-def test_recurrent_comb_space_length():
-    assert calculate_length_of_recurrent_comb_space(3, (3, 1, 1)) == 4
-    assert calculate_length_of_recurrent_comb_space(2, (3, 2, 2, 1)) == 9
-    assert calculate_length_of_recurrent_comb_space(3, (3, 2, 2, 1)) == 14
-    
