From 65c98d1fb0d9447254dcf5013c42cc23b74cdf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 16 May 2015 15:13:50 +0200 Subject: Divide evaluete script to functions --- scripts/evaluate.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/evaluate.py b/scripts/evaluate.py index 436879d..38a6cad 100755 --- a/scripts/evaluate.py +++ b/scripts/evaluate.py @@ -41,9 +41,7 @@ def reduce_matrix(A, symrow): columns.append(column) i -= 1 - -def evaluate(): - print("Collect data...") +def collect_data(): hashs = {} for fl in os.listdir(sf(conf.result_folder)): if os.path.isfile(os.path.join(sf(conf.result_folder), fl)): @@ -67,8 +65,9 @@ def evaluate(): for ln in f: vec.append(float(ln)) hashs[hash][1] = vec + return hashs - print('Build matrix...') +def build_matrix(hashs): A = [] B = [] for hash,data in hashs.items(): @@ -83,6 +82,14 @@ def evaluate(): A[x][y] = 0 else: A[x][y] = 1 + return A, B, symrow + +def evaluate(): + print("Collect data...") + hashs = collect_data() + + print('Build matrix...') + A, B, symrow = build_matrix(hashs) # Reduce matrix A print('Simplify matrix...') -- cgit v1.2.3