From 912672cbaca95f50f6f48902dbfabf21617f8373 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 20 Sep 2024 14:25:45 +0200 Subject: [PATCH 1/2] only merge on merge_keys present in both tables --- ci/basop-pages/create_report_pages.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/basop-pages/create_report_pages.py b/ci/basop-pages/create_report_pages.py index af937355ef..0a0dcfdb34 100644 --- a/ci/basop-pages/create_report_pages.py +++ b/ci/basop-pages/create_report_pages.py @@ -295,6 +295,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): for key in other_keys: new_row[f"{key}-{suffix1}"] = row1[key] + found_merge_key_in_both_tbls = False for row2 in tbl2: if row1[merge_key] == row2[merge_key]: new_row[merge_key] = row1[merge_key] @@ -303,9 +304,12 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): new_row[f"{key}-{suffix2}"] = row2[key] else: new_row[f"{key}-{suffix2}"] = "" + + found_merge_key_in_both_tbls = True break - merged.append(new_row) + if found_merge_key_in_both_tbls: + merged.append(new_row) return merged -- GitLab From d506919e4055b237e2bf571593e92d7bd79abd8b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 20 Sep 2024 14:26:40 +0200 Subject: [PATCH 2/2] run formatter --- ci/basop-pages/create_report_pages.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/basop-pages/create_report_pages.py b/ci/basop-pages/create_report_pages.py index 0a0dcfdb34..cf3a3a6472 100644 --- a/ci/basop-pages/create_report_pages.py +++ b/ci/basop-pages/create_report_pages.py @@ -199,11 +199,15 @@ def tr_from_row(row, id_current, id_previous): if float(curr) > float(prev): curr += f" {ARROW_UP}" # increase is bad -> mark in red, execpt for SNR for which it is good -> mark in green - td_tmpl_curr = TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE + td_tmpl_curr = ( + TD_TMPL_REDUCE if c == "MIN_SSNR" else TD_TMPL_INCREASE + ) elif float(curr) < float(prev): curr += f" {ARROW_DOWN}" # reduce is good -> mark in green, execpt for SNR for which it is bad -> mark in red - td_tmpl_curr = TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE + td_tmpl_curr = ( + TD_TMPL_INCREASE if c == "MIN_SSNR" else TD_TMPL_REDUCE + ) except ValueError: # if we land here, one of the cells is not a number, this indicates a crash # or some error in the scripts, so mark with red as well @@ -300,7 +304,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): if row1[merge_key] == row2[merge_key]: new_row[merge_key] = row1[merge_key] for key in other_keys: - if key in row2: # In case key is missing, just insert a blank + if key in row2: # In case key is missing, just insert a blank new_row[f"{key}-{suffix2}"] = row2[key] else: new_row[f"{key}-{suffix2}"] = "" @@ -314,7 +318,6 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys): return merged - if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument("html_out") -- GitLab