aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/presentation/generator_CPTA.py7
-rw-r--r--resources/tools/presentation/generator_tables.py8
-rw-r--r--resources/tools/presentation/input_data_parser.py2
-rw-r--r--resources/tools/presentation/specification_CPTA.yaml6
4 files changed, 14 insertions, 9 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 066bfbddc8..c3784e94ef 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -389,7 +389,7 @@ def _generate_all_charts(spec, input_data):
builds_lst.append(str(build["build"]))
# Get "build ID": "date" dict:
- build_info = dict()
+ build_info = OrderedDict()
for build in builds_lst:
try:
build_info[build] = (
@@ -398,6 +398,9 @@ def _generate_all_charts(spec, input_data):
)
except KeyError:
build_info[build] = ("", "")
+ logging.info("{}: {}, {}".format(build,
+ build_info[build][0],
+ build_info[build][1]))
# Create the header:
csv_table = list()
@@ -444,7 +447,7 @@ def _generate_all_charts(spec, input_data):
for period in chart["periods"]:
# Generate traces:
traces = list()
- win_size = 10 if period == 1 else 5 if period < 20 else 3
+ win_size = 14 if period == 1 else 5 if period < 20 else 3
idx = 0
for test_name, test_data in chart_data.items():
if not test_data:
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 985c787d2c..29e1006950 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -606,7 +606,7 @@ def table_performance_comparison_mrr(table, input_data):
item.append(round(stdev(data_t) / 1000000, 2))
else:
item.extend([None, None])
- if item[1] is not None and item[3] is not None:
+ if item[1] is not None and item[3] is not None and item[1] != 0:
item.append(int(relative_change(float(item[1]), float(item[3]))))
if len(item) == 6:
tbl_lst.append(item)
@@ -747,8 +747,10 @@ def table_performance_trending_dashboard(table, input_data):
classification = "outlier"
elif "progression" in classification_lst[first_idx:]:
classification = "progression"
- else:
+ elif "normal" in classification_lst[first_idx:]:
classification = "normal"
+ else:
+ classification = None
idx = len(classification_lst) - 1
while idx:
@@ -770,7 +772,7 @@ def table_performance_trending_dashboard(table, input_data):
# Sort the table according to the classification
tbl_sorted = list()
- for classification in ("regression", "outlier", "progression", "normal"):
+ for classification in ("regression", "progression", "outlier", "normal"):
tbl_tmp = [item for item in tbl_lst if item[4] == classification]
tbl_tmp.sort(key=lambda rel: rel[0])
tbl_sorted.extend(tbl_tmp)
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index db63660d43..18fea3e3a4 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -250,7 +250,7 @@ class ExecutionChecker(ResultVisitor):
self._data["metadata"]["version"] = self._version
self._msg_type = None
- logging.debug(" VPP version: {0}".format(self._version))
+ logging.info(" VPP version: {0}".format(self._version))
def _get_vat_history(self, msg):
"""Called when extraction of VAT command history is required.
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index f6d07e8063..4e2aad6d40 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -226,7 +226,7 @@
# to present all tests.
nr-of-tests-shown: 20
outlier-const: 1.5
- window: 10
+ window: 14
evaluated-window: 14
-
@@ -245,7 +245,7 @@
# to present all tests.
nr-of-tests-shown: 20
outlier-const: 1.5
- window: 10
+ window: 14
evaluated-window: 14
-
@@ -264,7 +264,7 @@
# to present all tests.
nr-of-tests-shown: 20
outlier-const: 1.5
- window: 10
+ window: 14
evaluated-window: 14
-