Merge pull request #9 from manzik/8-fix-setting-an-array-element-with…

…-a-sequence

Refactor data flattening in BenchmarkStats

cmdbench/utils.py

@@ -63,9 +63,9 @@ def get_dict_value_converted(value):
 class BenchmarkStats:
     def __init__(self, data):
         mean_val = sd_val = min_val = max_val = None
-        
+
         # Convert to numpy array and flatten
-        data = np.array(data).flatten()
+        data = self.__flatten_to_array(data)
 
         if type(data) is np.ndarray:
             if len(data) > 0:
@@ -76,6 +76,18 @@ def __init__(self, data):
 
         self.data = data
         self.mean, self.stdev, self.min, self.max = mean_val, sd_val, min_val, max_val
+
+    def __flatten_to_array(self, items):
+        flat_list = []
+        for item in items:
+            if isinstance(item, np.ndarray):
+                flat_list.extend(item.flatten())
+            elif isinstance(item, (list, tuple)):
+                flat_list.extend(self.__flatten_to_array(item))
+            else:
+                flat_list.append(item)
+        return np.array(flat_list)
+
     def __repr__(self):
         return "(mean: %(mean)s, stdev: %(stdev)s, min: %(min)s, max: %(max)s)" % {
             "mean": self.mean, "stdev": self.stdev,
@@ -128,4 +140,4 @@ def get_sec(time_str):
     time_tokens.reverse()
     for token_ind, time_token in enumerate(time_tokens):
         secs += int(time_token) * 60 ** token_ind
-    return secs + time_decimal
+    return secs + time_decimal

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmdbench"
-version = "0.1.21"
+version = "0.1.22"
 description = "Quick and easy benchmarking for any command's CPU, memory, disk usage and runtime."
 authors = ["Mohsen Yousefian <[email protected]>"]
 license = "MIT"