ver 0.15.4.1

miscs

Author: nuclearboy95

npy/utils/datastructure/meter.py

@@ -8,8 +8,8 @@ class MaxMeter:
     def __init__(self):
         self._max = float('-inf')
 
-    def update(self, v):
-        self._max = max(self._max, v)
+    def update(self, value):
+        self._max = max(self._max, value)
 
     @property
     def max(self):
@@ -20,8 +20,8 @@ class MinMeter:
     def __init__(self):
         self._min = float('inf')
 
-    def update(self, v):
-        self._min = max(self._min, v)
+    def update(self, value):
+        self._min = max(self._min, value)
 
     @property
     def min(self):
@@ -31,42 +31,60 @@ def min(self):
 class AverageMeter:
     def __init__(self):
         self.count = 0
-        self.value = 0
+        self.accumulate = 0
+        self.last_value = 0
 
-    def update(self, v, count=1):
+    def update(self, value, count=1):
         self.count += count
-        self.value += v
+        self.accumulate += value
+        self.last_value = value
 
     def reset(self):
         self.count = 0
-        self.value = 0
+        self.accumulate = 0
+        self.last_value = 0
 
     @property
     def avg(self):
         if self.count == 0:
             return 0
 
         else:
-            return self.value / self.count
+            return self.accumulate / self.count
 
 
 class AverageMeters:
     def __init__(self):
         self.meters = defaultdict(AverageMeter)
 
-    def update(self, key, v, count=1):
-        self.meters[key].update(v, count)
+    def update(self, key, value, count=1):
+        self.meters[key].update(value, count)
 
     def reset(self):
         for key in self.meters.keys():
             self.meters[key].reset()
 
+    def keys(self):
+        return sorted(self.meters.keys())
+
+    ###########################
+
     def avg(self, key):
         return self.meters[key].avg
 
+    def last_value(self, key):
+        return self.meters[key].last_value
+
     @property
     def avgs(self):
         return {
             key: self.meters[key].avg
             for key in self.meters.keys()
         }
+
+    @property
+    def last_values(self):
+        return {
+            key: self.meters[key].last_value
+            for key in self.meters.keys()
+        }

npy/utils/utils_primitive/utils_str.py

@@ -1,7 +1,7 @@
 import re
 
 __all__ = ['str2float', 'str2int', 'int_or_str2int', 'str2int_l',
-           'countchar', 'rmchar', 'rmchars', 'rmws', 'include_exclude']
+           'countchar', 'countcharfront', 'rmchar', 'rmchars', 'rmws', 'include_exclude']
 
 
 def str2float(s: str) -> float:
@@ -47,6 +47,16 @@ def countchar(s: str, c: str) -> int:
     return sum([int(cc == c) for cc in s])
 
 
+def countcharfront(s: str, c: str) -> int:
+    count = 0
+    for v in s:
+        if v == c:
+            count += 1
+        elif not v.isspace():
+            return count
+    return count
+
+
 def rmchar(s: str, c: str) -> str:
     return s.replace(c, '')
 

ntf/tb/read.py

@@ -9,10 +9,10 @@
 def scalars(fpath: str) -> list_of_dict:
     result = list()
     for event in tf.train.summary_iterator(fpath):
-        if len(event.summary.value) == 0:
+        if len(event.summary.accumulate) == 0:
             continue
         d = dict()
-        for v in event.summary.value:
+        for v in event.summary.accumulate:
             d[v.tag] = v.simple_value
         d['step'] = event.step
 

setup.py

@@ -10,7 +10,7 @@
 
 setup(name='nuclear-python',
 
-      version='0.15.4',
+      version='0.15.4.1',
 
       url='https://github.com/nuclearboy95/nuclear-python',