X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_tables.py;h=1071dee409d534dec80ef182384976a1f57bdc1e;hp=59059df08eada0bf937a1e0802e18ec1218b5f67;hb=3f2beec17f60c2c6b003c955e02451a77944197b;hpb=737fbd3341638e90478979779b5ee6c0b0bf5c39 diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 59059df08e..1071dee409 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -194,13 +194,13 @@ def table_performance_improvements(table, input_data): elif cmd == "operation": operation = args[0] try: - nr1 = tbl_item[int(args[1])]["data"] - nr2 = tbl_item[int(args[2])]["data"] + nr1 = float(tbl_item[int(args[1])]["data"]) + nr2 = float(tbl_item[int(args[2])]["data"]) if nr1 and nr2: tbl_item.append({"data": eval(operation)(nr1, nr2)}) else: tbl_item.append({"data": None}) - except IndexError: + except (IndexError, ValueError): logging.error("No data for {0}".format(tbl_item[1]["data"])) tbl_item.append({"data": None}) continue @@ -228,19 +228,19 @@ def table_performance_improvements(table, input_data): for item in tbl_lst: if "ndr_top" in file_name \ and "ndr" in item[1]["data"] \ - and item[-1]["data"] >= 10: + and item[-1]["data"] >= 10.0: _write_line_to_file(file_handler, item) elif "pdr_top" in file_name \ and "pdr" in item[1]["data"] \ - and item[-1]["data"] >= 10: + and item[-1]["data"] >= 10.0: _write_line_to_file(file_handler, item) elif "ndr_low" in file_name \ and "ndr" in item[1]["data"] \ - and item[-1]["data"] < 10: + and item[-1]["data"] < 10.0: _write_line_to_file(file_handler, item) elif "pdr_low" in file_name \ and "pdr" in item[1]["data"] \ - and item[-1]["data"] < 10: + and item[-1]["data"] < 10.0: _write_line_to_file(file_handler, item) logging.info(" Done.")