From de9fde3a1283d744ceaa5cd53685bb99e9b3f52a Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 8 Feb 2019 10:50:42 +0100 Subject: fix eval-outlier-removal to account for not-so-recent PTAModel.assess changes --- bin/eval-outlier-removal.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bin/eval-outlier-removal.py') diff --git a/bin/eval-outlier-removal.py b/bin/eval-outlier-removal.py index b6e8733..eafb0da 100755 --- a/bin/eval-outlier-removal.py +++ b/bin/eval-outlier-removal.py @@ -9,10 +9,11 @@ from dfatool import PTAModel, RawData, soft_cast_int, pta_trace_to_aggregate opts = {} def model_quality_table(result_lists, info_list): - for state_or_tran in result_lists[0].keys(): - for key in result_lists[0][state_or_tran].keys(): + for state_or_tran in result_lists[0]['by_dfa_component'].keys(): + for key in result_lists[0]['by_dfa_component'][state_or_tran].keys(): buf = '{:20s} {:15s}'.format(state_or_tran, key) for i, results in enumerate(result_lists): + results = results['by_dfa_component'] info = info_list[i] buf += ' ||| ' if info == None or info(state_or_tran, key): @@ -26,11 +27,12 @@ def model_quality_table(result_lists, info_list): print(buf) def combo_model_quality_table(result_lists, info_list): - for state_or_tran in result_lists[0][0].keys(): - for key in result_lists[0][0][state_or_tran].keys(): + for state_or_tran in result_lists[0][0]['by_dfa_component'].keys(): + for key in result_lists[0][0]['by_dfa_component'][state_or_tran].keys(): for sub_result_lists in result_lists: buf = '{:20s} {:15s}'.format(state_or_tran, key) for i, results in enumerate(sub_result_lists): + results = results['by_dfa_component'] info = info_list[i] buf += ' ||| ' if info == None or info(state_or_tran, key): -- cgit v1.2.3