From d6ac8c11f2dd957ef721374fa755cc99b09bc7ca Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Fri, 9 Feb 2024 08:21:27 +0100 Subject: --show-model-error: indicate loaded/json model values --- bin/analyze-archive.py | 2 ++ bin/analyze-kconfig.py | 1 + bin/analyze-log.py | 1 + lib/cli.py | 11 ++++++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py index aa1058c..d397893 100755 --- a/bin/analyze-archive.py +++ b/bin/analyze-archive.py @@ -753,6 +753,7 @@ def main(): xv_method=xv_method, xv_count=xv_count, error_metric=args.error_metric, + load_model=args.load_json, ) if args.with_substates: for submodel in model.submodel_by_name.values(): @@ -768,6 +769,7 @@ def main(): static=sub_static_quality, model_info=sub_param_info, error_metric=args.error_metric, + load_model=args.load_json, ) if "overall" in show_quality or "all" in show_quality: diff --git a/bin/analyze-kconfig.py b/bin/analyze-kconfig.py index b333613..4a1cb8c 100755 --- a/bin/analyze-kconfig.py +++ b/bin/analyze-kconfig.py @@ -530,6 +530,7 @@ def main(): xv_method=xv_method, xv_count=xv_count, error_metric=args.error_metric, + load_model=args.load_json, ) if args.show_model_complexity: diff --git a/bin/analyze-log.py b/bin/analyze-log.py index 5e4dded..b3c4fba 100755 --- a/bin/analyze-log.py +++ b/bin/analyze-log.py @@ -245,6 +245,7 @@ def main(): xv_method=xv_method, xv_count=xv_count, error_metric=args.error_metric, + load_model=args.load_json, ) if args.show_model_complexity: diff --git a/lib/cli.py b/lib/cli.py index c2839fb..e2c8779 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -247,7 +247,14 @@ def format_quality_measures(result, error_metric="smape", col_len=8): def model_quality_table( - lut, model, static, model_info, xv_method=None, xv_count=None, error_metric="smape" + lut, + model, + static, + model_info, + xv_method=None, + xv_count=None, + error_metric="smape", + load_model=False, ): key_len = len("Key") attr_len = len("Attribute") @@ -264,6 +271,8 @@ def model_quality_table( xv_header = "MC XV" elif xv_method: xv_header = "XV" + elif load_model: + xv_header = "json" else: xv_header = "training" -- cgit v1.2.3