-

cool-RR · cool-RR · commit cf5395128e32 · 2014-09-26T23:01:17.000+03:00
diff --git a/source_py3/python_toolbox/math_tools/sequences.py b/source_py3/python_toolbox/math_tools/sequences.py
@@ -67,8 +67,9 @@ def shitfuck(k, recurrence_counter):
         recurrence_counter = \
                        nifty_collections.FrozenCrateCounter(recurrence_counter)
     if k == 1:
-        assert recurrence_counter # Works because `FrozenCounter` implements
-                                  # `__bool__`.
+        assert recurrence_counter
+        # (Works because `FrozenCrateCounter` has a functioning `__bool__`,
+        # unlike Python's `Counter`.)
         return 1
     try:
         return _shitfuck_cache[(k, recurrence_counter)]
@@ -80,7 +81,8 @@ def shitfuck(k, recurrence_counter):
     while len(levels) < k and current_reccurence_counters:
         k_ = k - len(levels)
         levels.append(
-            {recurrence_counter_: recurrence_counter_.get_sub_counters_counter()
+            {recurrence_counter_: recurrence_counter_.
+                                       get_sub_counters_for_one_crate_removed()
              for recurrence_counter_ in current_reccurence_counters
                             if (k_, recurrence_counter_) not in _shitfuck_cache
         })
@@ -116,8 +118,9 @@ def catshit(k, recurrence_counter):
         recurrence_counter = \
                        nifty_collections.FrozenCrateCounter(recurrence_counter)
     if k == 1:
-        assert recurrence_counter # Works because `FrozenCounter` implements
-                                  # `__bool__`.
+        assert recurrence_counter
+        # (Works because `FrozenCrateCounter` has a functioning `__bool__`,
+        # unlike Python's `Counter`.)
         return 1
     try:
         return _catshit_cache[(k, recurrence_counter)]
@@ -129,24 +132,24 @@ def catshit(k, recurrence_counter):
     while len(levels) < k and current_reccurence_counters:
         k_ = k - len(levels)
         levels.append(
-            {recurrence_counter_: recurrence_counter_.get_sub_counters_counter()
+            {recurrence_counter_: recurrence_counter_.
+                    get_sub_counters_for_one_crate_and_previous_piles_removed()
              for recurrence_counter_ in current_reccurence_counters
-                            if (k_, recurrence_counter_) not in _catshit_cache
+                            if (k_, recurrence_counter_) not in _shitfuck_cache
         })
         current_reccurence_counters = \
                                      set(itertools.chain(*levels[-1].values()))
         
     # The last level is calculated. Time to make our way up.
     for k_, level in enumerate(reversed(levels), (k - len(levels) + 1)):
         if k_ == 1:
-            for recurrence_counter_, sub_counters_counter in level.items():
-                _catshit_cache[(k_, recurrence_counter_)] = \
-                                                 recurrence_counter_.n_elements
+            for recurrence_counter_, sub_counters in level.items():
+                _catshit_cache[(k_, recurrence_counter_)] = len(sub_counters)
         else:
-            for recurrence_counter_, sub_counters_counter in level.items():
+            for recurrence_counter_, sub_counters in level.items():
                 _catshit_cache[(k_, recurrence_counter_)] = sum(
                     (_catshit_cache[(k_ - 1, sub_counter)] * factor for
-                           sub_counter, factor in sub_counters_counter.items())
+                           sub_counter, factor in sub_counters.items())
                 )
     
     return _catshit_cache[(k, recurrence_counter)]
diff --git a/source_py3/python_toolbox/nifty_collections/frozen_crate_counter.py b/source_py3/python_toolbox/nifty_collections/frozen_crate_counter.py
@@ -48,7 +48,7 @@ def get_sub_counters_for_one_crate_and_previous_piles_removed(self):
             for i in range(value_of_key_to_reduce):
                 sub_counters.append(
                     FrozenCrateCounter(
-                        {key: ((value - i) if key == key_to_reduce else value)
+                        {key: (i if key == key_to_reduce else value)
                                        for key, value in sub_counter_prototype}
                     )
                 )
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
@@ -1,6 +1,6 @@
 
 
-from python_toolbox.math_tools import abs_stirling, shitfuck
+from python_toolbox.math_tools import abs_stirling, shitfuck, catshit
 
 
 def test_abs_stirling():
@@ -19,4 +19,8 @@ def test_abs_stirling():
 
 def test_shitfuck():
     assert shitfuck(3, (3, 1, 1)) == 13
+    
+
+def test_catshit():
+    assert catshit(3, (3, 1, 1)) == 13
     

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ def get_sub_counters_for_one_crate_and_previous_piles_removed(self):`
`48`	`48`	`for i in range(value_of_key_to_reduce):`
`49`	`49`	`sub_counters.append(`
`50`	`50`	`FrozenCrateCounter(`
`51`		`- {key: ((value - i) if key == key_to_reduce else value)`
	`51`	`+ {key: (i if key == key_to_reduce else value)`
`52`	`52`	`for key, value in sub_counter_prototype}`
`53`	`53`	`)`
`54`	`54`	`)`