SHLL small refactoring

Author: svpcom

hyperloglog/hll.py

@@ -150,13 +150,14 @@ def update(self, *others):
         """
         Merge other counters
         """
+        ml = [self.M]
 
         for item in others:
             if self.m != item.m:
                 raise ValueError('Counters precisions should be equal')
+            ml.append(item.M)
 
-        for o in others:
-            self.M = np.maximum(self.M, o.M)
+        self.M = np.maximum.reduce(ml)
 
     def __eq__(self, other):
         if self.m != other.m:

hyperloglog/shll.py

@@ -33,6 +33,7 @@ def __init__(self, error_rate, window, lpfm=None):
 
             if (1 << p) != m:
                 raise ValueError('List length is not power of 2')
+
             self.LPFM = lpfm
 
         else:
@@ -44,7 +45,7 @@ def __init__(self, error_rate, window, lpfm=None):
 
             p = math.ceil(math.log((1.04 / error_rate) ** 2, 2))
             m = 1 << p
-            self.LPFM = [None for i in range(m)]
+            self.LPFM = [tuple() for i in range(m)]
 
         self.alpha = get_alpha(p)
         self.p = p
@@ -79,8 +80,7 @@ def add(self, timestamp, value):
         Rmax = None
         tmp = []
         tmax = None
-        tmp2 = heapq.merge(self.LPFM[j] if self.LPFM[j] is not None else [],
-                           [(timestamp, R)], reverse=True)
+        tmp2 = heapq.merge(self.LPFM[j], ((timestamp, R),), reverse=True)
 
         for t, R in tmp2:
             if tmax is None:
@@ -93,7 +93,7 @@ def add(self, timestamp, value):
                 tmp.append((t, R))
                 Rmax = R
 
-        self.LPFM[j] = tuple(tmp) if tmp else None
+        self.LPFM[j] = tuple(tmp)
 
     def update(self, *others):
         """
@@ -104,15 +104,12 @@ def update(self, *others):
             if self.m != item.m:
                 raise ValueError('Counters precisions should be equal')
 
-        for j in range(len(self.LPFM)):
+        for j, lpfms_j in enumerate(zip(self.LPFM, *list(item.LPFM for item in others))):
             Rmax = None
             tmp = []
             tmax = None
-            tmp2 = heapq.merge(*([item.LPFM[j] if item.LPFM[j] is not None else [] for item in others] + \
-                                 [self.LPFM[j] if self.LPFM[j] is not None else []]),
-                               reverse=True)
 
-            for t, R in tmp2:
+            for t, R in heapq.merge(*lpfms_j, reverse=True):
                 if tmax is None:
                     tmax = t
 
@@ -123,7 +120,7 @@ def update(self, *others):
                     tmp.append((t, R))
                     Rmax = R
 
-            self.LPFM[j] = tuple(tmp) if tmp else None
+            self.LPFM[j] = tuple(tmp)
 
     def __eq__(self, other):
         if self.m != other.m:
@@ -177,16 +174,15 @@ def card_wlist(self, timestamp, window_list):
         for lpfm in self.LPFM:
             R_max = 0
             _p = len(tsl) - 1
-            if lpfm:
-                for i in range(len(lpfm)):
-                    ts, R = lpfm[i]
-                    while _p >= 0:
-                        _ts, _idx = tsl[_p]
-                        if ts >= _ts: break
-                        M_list[_idx].append(R_max)
-                        _p -= 1
-                    if _p < 0: break
-                    R_max = R
+
+            for ts, R in lpfm:
+                while _p >= 0:
+                    _ts, _idx = tsl[_p]
+                    if ts >= _ts: break
+                    M_list[_idx].append(R_max)
+                    _p -= 1
+                if _p < 0: break
+                R_max = R
 
             for i in range(0, _p + 1):
                 M_list[tsl[i][1]].append(R_max)