Report: data

Change-Id: I55b715aefd4d9d2e95010a445e6cef880875d0f1
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index af5fcd1..e66047f 100644 (file)
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -183,12 +183,13 @@ def table_performance_improvements(table, input_data):
                 for build in data[job]:
                     try:
                         data_lst.append(float(build[tmpl_item[0]]["throughput"]
-                                              ["value"]) / 1000000)
+                                              ["value"]))
                     except (KeyError, TypeError):
                         # No data, ignore
                         continue
                 if data_lst:
-                    tbl_item.append({"data": eval(operation)(data_lst)})
+                    tbl_item.append({"data": (eval(operation)(data_lst)) /
+                                             1000000})
                 else:
                     tbl_item.append({"data": None})
             elif cmd == "operation":

diff --git a/resources/tools/presentation/utils.py b/resources/tools/presentation/utils.py
index f9feeb0..cf3005c 100644 (file)
--- a/resources/tools/presentation/utils.py
+++ b/resources/tools/presentation/utils.py
@@ -57,7 +57,7 @@ def relative_change(nr1, nr2):
     :rtype: float
     """
 
-    return float((nr2 - nr1) / nr1 * 100)
+    return float(((nr2 - nr1) / nr1) * 100)
 
 
 def get_files(path, extension=None, full_path=True):