SSH multi 1.2 fix

simrunner/simrunner.py

@@ -37,7 +37,7 @@ def set_arguments_various(da_config):
     e_list = []
     byte_sizes = ['16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192',
                   '16384', '32768', '65536', '131072', '262144', '524288', '1048576', '2097152',
-                  '4194304', '8388608', '16777216', '33554432', '67108864']
+                  '4194304', '8388608']
 
     for event in byte_sizes:
         event_name = "Data_Set_" + event

visualizer/visualizer/DataFrameCreator.py

@@ -38,8 +38,13 @@ class DataFrameCreator:
 
     @staticmethod
     def _extract_statistics(data, filename):
-        print(filename)
         result = {}
+        match = re.search(r'\d+(?=\.\w+$)', filename)
+        if match:
+            last_numbers = int(match.group())
+            datasize = last_numbers
+        else:
+            datasize = 0
         group_match = re.search(r"(.*):", data)
         if group_match:
             group = group_match.group(1)
@@ -54,6 +59,8 @@ class DataFrameCreator:
         else:
             result["Group"] = ""
             result["thread"] = ""
+        result["size"] = int(datasize)
+
         values = re.findall(r"\d+\.\d+", data)
         result["min"] = float(values[0])
         result["mean"] = float(values[1])
@@ -135,7 +142,7 @@ class DataFrameCreator:
             if os.path.basename(root) == "statistics":
                 for filename in folder:
                     self.read_statistic_data(root, filename)
-            elif os.path.basename(root) == "Data_Set_Long":
+            elif "Data_Set_Long" in os.path.basename(root):
                 for filename in folder:
                     self.read_long_data(root, filename)
             else: