updated performance tests

Author: flexatone

doc/articles/array2d_to_1d.py renamed to doc/articles/array_to_tuple_array.py

@@ -33,12 +33,16 @@ class PyArray2D1D(ArrayProcessor):
 
     def __call__(self):
         post = np.empty(self.array.shape[0], dtype=object)
-        for i, row in enumerate(self.array):
-            post[i] = tuple(row)
+        if self.array.ndim == 1:
+            for i, e in enumerate(self.array):
+                post[i] = (e,)
+        else:
+            for i, row in enumerate(self.array):
+                post[i] = tuple(row)
         post.flags.writeable = False
 
 #-------------------------------------------------------------------------------
-NUMBER = 200
+NUMBER = 1
 
 def seconds_to_display(seconds: float) -> str:
     seconds /= NUMBER
@@ -111,7 +115,7 @@ def plot_performance(frame):
             bottom=0.05,
             right=0.8,
             top=0.85,
-            wspace=0.9, # width
+            wspace=1.0, # width
             hspace=0.5,
             )
     # plt.rcParams.update({'font.size': 22})
@@ -130,14 +134,17 @@ class FixtureFactory:
 
     @staticmethod
     def get_array(size: int, width_ratio: int) -> np.ndarray:
-        return np.arange(size).reshape(size // width_ratio, width_ratio)
+        if width_ratio > 1:
+            return np.arange(size).reshape(size // width_ratio, width_ratio)
+        return np.arange(size) # return 1D array
 
     @classmethod
     def get_label_array(cls, size: int) -> tp.Tuple[str, np.ndarray]:
         array = cls.get_array(size)
         return cls.NAME, array
 
     DENSITY_TO_DISPLAY = {
+        'column-1': '1 Column',
         'column-2': '2 Column',
         'column-5': '5 Column',
         'column-10': '10 Column',
@@ -150,6 +157,15 @@ def get_label_array(cls, size: int) -> tp.Tuple[str, np.ndarray]:
     # }
 
 
+class FFC1(FixtureFactory):
+    NAME = 'column-1'
+
+    @staticmethod
+    def get_array(size: int) -> np.ndarray:
+        a = FixtureFactory.get_array(size, 1)
+        return a
+
+
 class FFC2(FixtureFactory):
     NAME = 'column-2'
 
@@ -193,6 +209,7 @@ def get_versions() -> str:
     )
 
 CLS_FF = (
+    FFC1,
     FFC2,
     FFC5,
     FFC10,

doc/articles/array2d_tuple_iter.py renamed to doc/articles/array_to_tuple_iter.py

@@ -45,26 +45,38 @@ class PyArray2DTupleMapList(ArrayProcessor):
 
     def __call__(self):
         array = self.array
-        _ = list(map(tuple, array))
+        if array.ndim == 2:
+            _ = list(map(tuple, array))
+        else:
+            _ = list(map(lambda e: (e,), array))
 
 class PyArray2DTupleIterNext(ArrayProcessor):
     NAME = 'tuple(next(iter(a2d)))'
     SORT = 3
 
     def __call__(self):
-        it = iter(self.array)
-        while True:
-            try:
-                _ = tuple(next(it))
-            except StopIteration:
-                break
+        array = self.array
+        it = iter(array)
+        if array.ndim == 2:
+            while True:
+                try:
+                    _ = tuple(next(it))
+                except StopIteration:
+                    break
+        else:
+            while True:
+                try:
+                    _ = (next(it),)
+                except StopIteration:
+                    break
+
 
 
 
 
 
 #-------------------------------------------------------------------------------
-NUMBER = 200
+NUMBER = 100
 
 def seconds_to_display(seconds: float) -> str:
     seconds /= NUMBER
@@ -156,21 +168,33 @@ class FixtureFactory:
 
     @staticmethod
     def get_array(size: int, width_ratio: int) -> np.ndarray:
-        return np.arange(size).reshape(size // width_ratio, width_ratio)
+        if width_ratio > 1:
+            return np.arange(size).reshape(size // width_ratio, width_ratio)
+        return np.arange(size) # return 1D array
 
     @classmethod
     def get_label_array(cls, size: int) -> tp.Tuple[str, np.ndarray]:
         array = cls.get_array(size)
         return cls.NAME, array
 
     DENSITY_TO_DISPLAY = {
+        'column-1': '1 Column',
         'column-2': '2 Column',
         'column-5': '5 Column',
         'column-10': '10 Column',
         'column-20': '20 Column',
     }
 
 
+class FFC1(FixtureFactory):
+    NAME = 'column-1'
+
+    @staticmethod
+    def get_array(size: int) -> np.ndarray:
+        a = FixtureFactory.get_array(size, 1)
+        return a
+
+
 class FFC2(FixtureFactory):
     NAME = 'column-2'
 
@@ -217,6 +241,7 @@ def get_versions() -> str:
 
 
 CLS_FF = (
+    FFC1,
     FFC2,
     FFC5,
     FFC10,
@@ -226,7 +251,7 @@ def get_versions() -> str:
 
 def run_test():
     records = []
-    for size in (1_000, 10_000, 100_000, 1_000_000):
+    for size in (1_000, 10_000, 100_000): #, 1_000_000):
         for ff in CLS_FF:
             fixture_label, fixture = ff.get_label_array(size)
             for cls in CLS_PROCESSOR: