X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=814fbe450c8473f53b5d7d5cb1f9ce3a4b599c57;hp=6c301878ce4e5cb04e581f059ebe677deecc1009;hb=4a778c818108baf64a5abe6ffd6b27a4a88a2633;hpb=4a40c75ffc9f6b62a2eb58007675ef17f4c32b1e

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 6c301878ce..814fbe450c 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -18,7 +18,6 @@
 import logging
 import csv
 import prettytable
-import numpy as np
 import pandas as pd
 
 from string import replace
@@ -441,7 +440,7 @@ def table_performance_comparison(table, input_data):
                                                table["output-file-ext"])
                  ]
     for file_name in tbl_names:
-        logging.info("      Writing file: '{}'".format(file_name))
+        logging.info("      Writing file: '{0}'".format(file_name))
         with open(file_name, "w") as file_handler:
             file_handler.write(header_str)
             for test in tbl_lst:
@@ -462,7 +461,7 @@ def table_performance_comparison(table, input_data):
 
     for i, txt_name in enumerate(tbl_names_txt):
         txt_table = None
-        logging.info("      Writing file: '{}'".format(txt_name))
+        logging.info("      Writing file: '{0}'".format(txt_name))
         with open(tbl_names[i], 'rb') as csv_file:
             csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
             for row in csv_content:
@@ -484,7 +483,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-ndr-1t1c-top{1}".format(table["output-file"],
                                                table["output-file-ext"])
-    logging.info("      Writing file: '{}'".format(output_file))
+    logging.info("      Writing file: '{0}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[1:]):
@@ -494,7 +493,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-ndr-1t1c-bottom{1}".format(table["output-file"],
                                                   table["output-file-ext"])
-    logging.info("      Writing file: '{}'".format(output_file))
+    logging.info("      Writing file: '{0}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[-1:0:-1]):
@@ -511,7 +510,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-pdr-1t1c-top{1}".format(table["output-file"],
                                                table["output-file-ext"])
-    logging.info("      Writing file: '{}'".format(output_file))
+    logging.info("      Writing file: '{0}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[1:]):
@@ -521,7 +520,7 @@ def table_performance_comparison(table, input_data):
 
     output_file = "{0}-pdr-1t1c-bottom{1}".format(table["output-file"],
                                                   table["output-file-ext"])
-    logging.info("      Writing file: '{}'".format(output_file))
+    logging.info("      Writing file: '{0}'".format(output_file))
     with open(output_file, "w") as out_file:
         out_file.write(header_str)
         for i, line in enumerate(lines[-1:0:-1]):
@@ -567,8 +566,8 @@ def table_performance_trending_dashboard(table, input_data):
                                           "data": list()}
                 try:
                     tbl_dict[tst_name]["data"]. \
-                        append(tst_data["throughput"]["value"])
-                except TypeError:
+                        append(tst_data["result"]["throughput"])
+                except (TypeError, KeyError):
                     pass  # No data in output.xml for this test
 
     tbl_lst = list()
@@ -580,7 +579,8 @@ def table_performance_trending_dashboard(table, input_data):
             # Test name:
             name = tbl_dict[tst_name]["name"]
             # Throughput trend:
-            trend = list(pd_data.rolling(window=win_size).median())[-2]
+            trend = list(pd_data.rolling(window=win_size, min_periods=2).
+                         median())[-2]
             # Anomaly:
             t_data, _ = find_outliers(pd_data)
             last = list(t_data)[-1]
@@ -594,31 +594,33 @@ def table_performance_trending_dashboard(table, input_data):
                 anomaly = "progression"
             else:
                 anomaly = "normal"
-            # Change:
-            change = round(float(last - trend) / 1000000, 2)
-            # Relative change:
-            rel_change = int(relative_change(float(trend), float(last)))
 
-            tbl_lst.append([name,
-                            round(float(last) / 1000000, 2),
-                            change,
-                            rel_change,
-                            anomaly])
+            if not isnan(last) and not isnan(trend) and trend != 0:
+                # Change:
+                change = round(float(last - trend) / 1000000, 2)
+                # Relative change:
+                rel_change = int(relative_change(float(trend), float(last)))
+
+                tbl_lst.append([name,
+                                round(float(last) / 1000000, 2),
+                                change,
+                                rel_change,
+                                anomaly])
 
     # Sort the table according to the relative change
-    tbl_lst.sort(key=lambda rel: rel[-1], reverse=True)
+    tbl_lst.sort(key=lambda rel: rel[-2], reverse=True)
 
-    file_name = "{}.{}".format(table["output-file"], table["output-file-ext"])
+    file_name = "{0}.{1}".format(table["output-file"], table["output-file-ext"])
 
-    logging.info("      Writing file: '{}'".format(file_name))
+    logging.info("      Writing file: '{0}'".format(file_name))
     with open(file_name, "w") as file_handler:
         file_handler.write(header_str)
         for test in tbl_lst:
             file_handler.write(",".join([str(item) for item in test]) + '\n')
 
-    txt_file_name = "{}.txt".format(table["output-file"])
+    txt_file_name = "{0}.txt".format(table["output-file"])
     txt_table = None
-    logging.info("      Writing file: '{}'".format(txt_file_name))
+    logging.info("      Writing file: '{0}'".format(txt_file_name))
     with open(file_name, 'rb') as csv_file:
         csv_content = csv.reader(csv_file, delimiter=',', quotechar='"')
         for row in csv_content: