X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=a022c65e093471d222cbab03ceaf97254b4cec0b;hb=c046d7b7d364abcfdbdfcdbe0df970e55dc9c3f1;hp=f55c41ecf725670da24d04726992fe76a7161916;hpb=79bcdf2e3321ca46c07e6b49a77ce1cf5b513956;p=csit.git diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index f55c41ecf7..a022c65e09 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -22,7 +22,7 @@ import prettytable from string import replace from errors import PresentationError -from utils import mean, stdev, relative_change, remove_outliers +from utils import mean, stdev, relative_change, find_outliers def generate_tables(spec, data): @@ -401,17 +401,17 @@ def table_performance_comparison(table, input_data): for tst_name in tbl_dict.keys(): item = [tbl_dict[tst_name]["name"], ] if tbl_dict[tst_name]["ref-data"]: - item.append(round(mean(remove_outliers( - tbl_dict[tst_name]["ref-data"], 2)) / 1000000, 2)) - item.append(round(stdev(remove_outliers( - tbl_dict[tst_name]["ref-data"], 2)) / 1000000, 2)) + data_t, _ = find_outliers(tbl_dict[tst_name]["ref-data"], + table["outlier-const"]) + item.append(round(mean(data_t) / 1000000, 2)) + item.append(round(stdev(data_t) / 1000000, 2)) else: item.extend([None, None]) if tbl_dict[tst_name]["cmp-data"]: - item.append(round(mean(remove_outliers( - tbl_dict[tst_name]["cmp-data"], 2)) / 1000000, 2)) - item.append(round(stdev(remove_outliers( - tbl_dict[tst_name]["cmp-data"], 2)) / 1000000, 2)) + data_t, _ = find_outliers(tbl_dict[tst_name]["cmp-data"], + table["outlier-const"]) + item.append(round(mean(data_t) / 1000000, 2)) + 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: