summaryrefslogtreecommitdiff
path: root/lib/automata.py
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2021-03-05 09:19:59 +0100
committerDaniel Friesel <daniel.friesel@uos.de>2021-03-05 09:19:59 +0100
commit593f4767829f0aae2e598a09d337da88d169973a (patch)
treeeb000ca01104e1daac91f37b3607696cd6a0f834 /lib/automata.py
parent6972b984f633cb2c89c67f6fe268a52c8259a3d1 (diff)
eval: remove unused function_args argument
Diffstat (limited to 'lib/automata.py')
-rwxr-xr-xlib/automata.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/automata.py b/lib/automata.py
index 5849daa..c59f47a 100755
--- a/lib/automata.py
+++ b/lib/automata.py
@@ -1108,6 +1108,7 @@ class PTA:
for i in range(len(self.parameters))
]
)
+ param_list = dict_to_list(param_dict)
for function in trace:
if isinstance(function[0], Transition):
function_name = function[0].name
@@ -1120,7 +1121,7 @@ class PTA:
total_energy += state.get_energy(duration, param_dict)
if state.power.value_error is not None:
total_energy_error += (
- duration * state.power.eval_mae(param_dict, function_args)
+ duration * state.power.eval_mae(param_list + function_args)
) ** 2
total_duration += duration
# assumption: sleep is near-exact and does not contribute to the duration error
@@ -1128,17 +1129,15 @@ class PTA:
accounting.sleep(duration)
else:
transition = state.get_transition(function_name)
- total_duration += transition.duration.eval(
- dict_to_list(param_dict) + function_args
- )
+ total_duration += transition.duration.eval(param_list + function_args)
if transition.duration.value_error is not None:
total_duration_mae += (
- transition.duration.eval_mae(param_dict, function_args) ** 2
+ transition.duration.eval_mae(param_list + function_args) ** 2
)
total_energy += transition.get_energy(param_dict, function_args)
if transition.energy.value_error is not None:
total_energy_error += (
- transition.energy.eval_mae(param_dict, function_args) ** 2
+ transition.energy.eval_mae(param_list + function_args) ** 2
)
param_dict = transition.get_params_after_transition(
param_dict, function_args