-

cool-RR · cool-RR · commit 3d4fe62f6dd1 · 2014-09-26T23:16:46.000+03:00
diff --git a/source_py3/python_toolbox/math_tools/sequences.py b/source_py3/python_toolbox/math_tools/sequences.py
@@ -84,8 +84,8 @@ def shitfuck(k, recurrence_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
-        })
+                          if (k_, recurrence_counter_) not in _shitfuck_cache}
+        )
         current_reccurence_counters = \
                                      set(itertools.chain(*levels[-1].values()))
         
@@ -135,8 +135,8 @@ def catshit(k, recurrence_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 _shitfuck_cache
-        })
+                            if (k_, recurrence_counter_) not in _catshit_cache}
+        )
         current_reccurence_counters = \
                                      set(itertools.chain(*levels[-1].values()))
         
@@ -148,8 +148,8 @@ def catshit(k, recurrence_counter):
         else:
             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.items())
+                    (_catshit_cache[(k_ - 1, sub_counter)] for
+                                                   sub_counter in sub_counters)
                 )
     
     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
@@ -49,7 +49,7 @@ def get_sub_counters_for_one_crate_and_previous_piles_removed(self):
                 sub_counters.append(
                     FrozenCrateCounter(
                         {key: (i if key == key_to_reduce else value)
-                                       for key, value in sub_counter_prototype}
+                               for key, value in sub_counter_prototype.items()}
                     )
                 )
         return tuple(sub_counters)
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,8 +19,12 @@ def test_abs_stirling():
 
 def test_shitfuck():
     assert shitfuck(3, (3, 1, 1)) == 13
+    assert shitfuck(2, (3, 2, 2, 1)) == 15
+    assert shitfuck(3, (3, 2, 2, 1)) == 52
     
 
 def test_catshit():
-    assert catshit(3, (3, 1, 1)) == 13
+    assert catshit(3, (3, 1, 1)) == 4
+    assert catshit(2, (3, 2, 2, 1)) == 9
+    assert catshit(3, (3, 2, 2, 1)) == 14
     

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