From 0c3f350a577cfb1b36d45707ae3f36c2fe0d46ba Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Wed, 10 Jan 2024 10:55:56 +0100 Subject: refactor --show-model=param into lib/cli.py --- bin/analyze-archive.py | 32 ++++++-------------------------- bin/analyze-kconfig.py | 17 +++-------------- bin/analyze-log.py | 15 +++------------ 3 files changed, 12 insertions(+), 52 deletions(-) (limited to 'bin') diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py index ffc0d67..c91150d 100755 --- a/bin/analyze-archive.py +++ b/bin/analyze-archive.py @@ -679,35 +679,15 @@ if __name__ == "__main__": for state in model.states: for attribute in model.attributes(state): info = param_info(state, attribute) - if type(info) is df.AnalyticFunction: - dfatool.cli.print_analyticinfo(f"{state:10s} {attribute:15s}", info) - elif type(info) is df.CARTFunction: - dfatool.cli.print_cartinfo( - f"{state:10s} {attribute:15s}", info, model.parameters - ) - elif type(info) is df.SplitFunction: - dfatool.cli.print_splitinfo( - model.parameters, info, f"{state:10s} {attribute:15s}" - ) - elif type(info) is df.StaticFunction: - dfatool.cli.print_staticinfo(f"{state:10s} {attribute:15s}", info) - elif type(info) is df.SubstateFunction: - print(f"{state:10s} {attribute:15s}: Substate (TODO)") + dfatool.cli.print_model( + f"{state:10s} {attribute:15s}", info, model.parameters + ) for trans in model.transitions: for attribute in model.attributes(trans): info = param_info(trans, attribute) - if type(info) is df.AnalyticFunction: - dfatool.cli.print_analyticinfo(f"{trans:10s} {attribute:15s}", info) - elif type(info) is df.CARTFunction: - dfatool.cli.print_cartinfo( - f"{trans:10s} {attribute:15s}", info, model.parameters - ) - elif type(info) is df.SplitFunction: - dfatool.cli.print_splitinfo( - model.parameters, info, f"{trans:10s} {attribute:15s}" - ) - elif type(info) is df.SubstateFunction: - print(f"{state:10s} {attribute:15s}: Substate (TODO)") + dfatool.cli.print_model( + f"{trans:10s} {attribute:15s}", info, model.parameters + ) if args.with_substates: for submodel in model.submodel_by_name.values(): sub_param_model, sub_param_info = submodel.get_fitted() diff --git a/bin/analyze-kconfig.py b/bin/analyze-kconfig.py index baf3cc7..098d6ba 100755 --- a/bin/analyze-kconfig.py +++ b/bin/analyze-kconfig.py @@ -528,20 +528,9 @@ def main(): for name in model.names: for attribute in model.attributes(name): info = param_info(name, attribute) - if type(info) is df.AnalyticFunction: - dfatool.cli.print_analyticinfo(f"{name:20s} {attribute:15s}", info) - elif type(info) is df.CARTFunction: - dfatool.cli.print_cartinfo( - f"{name:20s} {attribute:15s}", info, model.parameters - ) - elif type(info) is df.FOLFunction: - dfatool.cli.print_analyticinfo(f"{name:20s} {attribute:15s}", info) - elif type(info) is df.SplitFunction: - dfatool.cli.print_splitinfo( - model.parameters, info, f"{name:20s} {attribute:15s}" - ) - elif type(info) is df.StaticFunction: - dfatool.cli.print_staticinfo(f"{name:10s} {attribute:15s}", info) + dfatool.cli.print_model( + f"{name:20s} {attribute:15s}", info, model.parameters + ) if "table" in args.show_quality or "all" in args.show_quality: if xv_method is not None: diff --git a/bin/analyze-log.py b/bin/analyze-log.py index b1dc6ba..9c24641 100755 --- a/bin/analyze-log.py +++ b/bin/analyze-log.py @@ -227,18 +227,9 @@ def main(): for name in sorted(model.names): for attribute in sorted(model.attributes(name)): info = param_info(name, attribute) - if type(info) is df.AnalyticFunction: - dfatool.cli.print_analyticinfo(f"{name:10s} {attribute:15s}", info) - elif type(info) is df.CARTFunction: - dfatool.cli.print_cartinfo( - f"{name:10s} {attribute:15s}", info, model.parameters - ) - elif type(info) is df.SplitFunction: - dfatool.cli.print_splitinfo( - model.parameters, info, f"{name:10s} {attribute:15s}" - ) - elif type(info) is df.StaticFunction: - dfatool.cli.print_staticinfo(f"{state:10s} {attribute:15s}", info) + dfatool.cli.print_model( + f"{name:10s} {attribute:15s}", info, model.parameters + ) if "table" in args.show_quality or "all" in args.show_quality: if xv_method is not None: -- cgit v1.2.3