-

cool-RR · cool-RR · commit 4b6dca581d8d · 2014-09-26T20:31:41.000+03:00
diff --git a/source_py3/python_toolbox/math_tools/sequences.py b/source_py3/python_toolbox/math_tools/sequences.py
@@ -95,7 +95,8 @@ def shitfuck(k, recurrence_counter):
              for recurrence_counter_ in current_reccurence_counters
                                   if recurrence_counter_ not in _shitfuck_cache
         })
-        current_reccurence_counters = set(itertools.chain(levels[-1].values()))
+        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)):
@@ -110,7 +111,7 @@ def shitfuck(k, recurrence_counter):
             for recurrence_counter_, sub_counters_counter in level.items():
                 _shitfuck_cache[(k_, recurrence_counter_)] = sum(
                     (_shitfuck_cache[(k_ - 1, sub_counter)] * factor for
-                                   sub_counter, factor in sub_counters_counter)
+                           sub_counter, factor in sub_counters_counter.items())
                 )
     
     return _shitfuck_cache[(k, recurrence_counter)]
diff --git a/source_py3/python_toolbox/nifty_collections/frozen_counter.py b/source_py3/python_toolbox/nifty_collections/frozen_counter.py
@@ -42,9 +42,8 @@ def __init__(self, iterable=None, **kwargs):
         if kwargs:
             self._dict.update(kwargs)
             
-        for key, value in self.items():
-            if value == 0:
-                del self._dict[key]
+        for key in [key for key, value in self.items() if value == 0]:
+            del self._dict[key]
 
 
     __getitem__ = lambda self, key: self._dict.get(key, 0)
@@ -207,5 +206,5 @@ def __and__(self, other):
     __bool__ = lambda self: any(True for element in self.elements())
     
     n_elements = property( # blocktodo: want to make this cached but import loop
-        lambda self: sum(value for value in values if value >= 1)
+        lambda self: sum(value for value in self.values() if value >= 1)
     )
