Report: Remove decimals from delta and stdev in tables

[csit.git] / resources / tools / presentation / generator_tables.py

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 2e2dfef..bdd6e22 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -463,8 +463,9 @@ def _tpc_sort_table(table):
     # Sort the tables:
     tbl_new.sort(key=lambda rel: rel[0], reverse=False)
     tbl_see.sort(key=lambda rel: rel[0], reverse=False)
-    tbl_see.sort(key=lambda rel: rel[-1], reverse=False)
-    tbl_delta.sort(key=lambda rel: rel[-1], reverse=True)
+    tbl_see.sort(key=lambda rel: rel[-2], reverse=False)
+    tbl_delta.sort(key=lambda rel: rel[0], reverse=False)
+    tbl_delta.sort(key=lambda rel: rel[-2], reverse=True)
 
     # Put the tables together:
     table = list()
@@ -549,7 +550,7 @@ def _tpc_generate_html_table(header, data, output_file_name):
                 xanchor=u"left",
                 y=1.045,
                 yanchor=u"top",
-                active=len(menu_items) - 1,
+                active=len(menu_items) - 2,
                 buttons=list(buttons)
             )
         ],
@@ -813,6 +814,7 @@ def table_perf_comparison(table, input_data):
             pass
         elif item[-4] == u"Not tested":
             item.append(u"New in CSIT-2001")
+            item.append(u"New in CSIT-2001")
         # elif topo == u"2n-skx" and u"dot1q" in tbl_dict[tst_name][u"name"]:
         #     item.append(u"See footnote [1]")
         #     footnote = True
@@ -820,9 +822,9 @@ def table_perf_comparison(table, input_data):
             delta, d_stdev = relative_change_stdev(
                 data_r_mean, data_c_mean, data_r_stdev, data_c_stdev
             )
-            item.append(round(delta, 2))
-            item.append(round(d_stdev, 2))
-        if (len(item) == len(header)) and (item[-3] != u"Not tested"):
+            item.append(round(delta))
+            item.append(round(d_stdev))
+        if (len(item) == len(header)) and (item[-4] != u"Not tested"):
             tbl_lst.append(item)
 
     tbl_lst = _tpc_sort_table(tbl_lst)
@@ -1105,6 +1107,7 @@ def table_perf_comparison_nic(table, input_data):
             pass
         elif item[-4] == u"Not tested":
             item.append(u"New in CSIT-2001")
+            item.append(u"New in CSIT-2001")
         # elif topo == u"2n-skx" and u"dot1q" in tbl_dict[tst_name][u"name"]:
         #     item.append(u"See footnote [1]")
         #     footnote = True
@@ -1112,9 +1115,9 @@ def table_perf_comparison_nic(table, input_data):
             delta, d_stdev = relative_change_stdev(
                 data_r_mean, data_c_mean, data_r_stdev, data_c_stdev
             )
-            item.append(round(delta, 2))
-            item.append(round(d_stdev, 2))
-        if (len(item) == len(header)) and (item[-3] != u"Not tested"):
+            item.append(round(delta))
+            item.append(round(d_stdev))
+        if (len(item) == len(header)) and (item[-4] != u"Not tested"):
             tbl_lst.append(item)
 
     tbl_lst = _tpc_sort_table(tbl_lst)
@@ -1250,8 +1253,8 @@ def table_nics_comparison(table, input_data):
             delta, d_stdev = relative_change_stdev(
                 data_r_mean, data_c_mean, data_r_stdev, data_c_stdev
             )
-            item.append(round(delta, 2))
-            item.append(round(d_stdev, 2))
+            item.append(round(delta))
+            item.append(round(d_stdev))
             tbl_lst.append(item)
 
     # Sort the table according to the relative change
@@ -1384,8 +1387,8 @@ def table_soak_vs_ndr(table, input_data):
         if data_r_mean and data_c_mean:
             delta, d_stdev = relative_change_stdev(
                 data_r_mean, data_c_mean, data_r_stdev, data_c_stdev)
-            item.append(round(delta, 2))
-            item.append(round(d_stdev, 2))
+            item.append(round(delta))
+            item.append(round(d_stdev))
             tbl_lst.append(item)
 
     # Sort the table according to the relative change