From 486690f31dfe8da33fbd0711137844424d0321eb Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <birte.friesel@uos.de>
Date: Mon, 12 Feb 2024 10:51:42 +0100
Subject: unfuck param_names / feature_names handling
---
bin/analyze-archive.py | 16 +++++++++-------
bin/analyze-kconfig.py | 4 +---
bin/analyze-log.py | 4 +---
3 files changed, 11 insertions(+), 13 deletions(-)
(limited to 'bin')
diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py
index 42c70ec..e3d1232 100755
--- a/bin/analyze-archive.py
+++ b/bin/analyze-archive.py
@@ -694,15 +694,11 @@ def main():
for state in model.states:
for attribute in model.attributes(state):
info = param_info(state, attribute)
- dfatool.cli.print_model(
- f"{state:10s} {attribute:15s}", info, model.parameters
- )
+ dfatool.cli.print_model(f"{state:10s} {attribute:15s}", info)
for trans in model.transitions:
for attribute in model.attributes(trans):
info = param_info(trans, attribute)
- dfatool.cli.print_model(
- f"{trans:10s} {attribute:15s}", info, model.parameters
- )
+ dfatool.cli.print_model(f"{trans:10s} {attribute:15s}", info)
if args.with_substates:
for submodel in model.submodel_by_name.values():
sub_param_model, sub_param_info = submodel.get_fitted()
@@ -868,7 +864,13 @@ def main():
if args.export_json:
with open(args.export_json, "w") as f:
- json.dump(model.to_json(), f, sort_keys=True, cls=dfatool.utils.NpEncoder)
+ json.dump(
+ model.to_json(),
+ f,
+ sort_keys=True,
+ cls=dfatool.utils.NpEncoder,
+ indent=2,
+ )
if args.export_webconf:
if not pta:
diff --git a/bin/analyze-kconfig.py b/bin/analyze-kconfig.py
index c92db5c..1da926b 100755
--- a/bin/analyze-kconfig.py
+++ b/bin/analyze-kconfig.py
@@ -522,9 +522,7 @@ def main():
for name in model.names:
for attribute in model.attributes(name):
info = param_info(name, attribute)
- dfatool.cli.print_model(
- f"{name:20s} {attribute:15s}", info, model.parameters
- )
+ dfatool.cli.print_model(f"{name:20s} {attribute:15s}", info)
if args.show_model_error:
dfatool.cli.model_quality_table(
diff --git a/bin/analyze-log.py b/bin/analyze-log.py
index 3c0fc12..db071fd 100755
--- a/bin/analyze-log.py
+++ b/bin/analyze-log.py
@@ -237,9 +237,7 @@ def main():
for name in sorted(model.names):
for attribute in sorted(model.attributes(name)):
info = param_info(name, attribute)
- dfatool.cli.print_model(
- f"{name:10s} {attribute:15s}", info, model.parameters
- )
+ dfatool.cli.print_model(f"{name:10s} {attribute:15s}", info)
if args.show_model_error:
dfatool.cli.model_quality_table(
--
cgit v1.2.3