From 3f571ed0386697228398d89327db1c230c46207f Mon Sep 17 00:00:00 2001 From: sipp11 Date: Sun, 19 Oct 2014 00:24:57 +0700 Subject: [PATCH] [s11] fix misunderstood / add what I left out --- s11.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/s11.py b/s11.py index 123295d..432ae39 100644 --- a/s11.py +++ b/s11.py @@ -79,8 +79,21 @@ def processingS11(model, rtype, ksearch): ### [s11] (2) & (3) zipped_list = zip(data_only, w_only, l_only) - multiply_n_add = [(float(_[0])*float(_[1]))+float(_[2]) for _ in zipped_list] - result.append(i[:1]+multiply_n_add) + multiply_by_weight = [(float(_[0])*float(_[1])) for _ in zipped_list] + + ## get sum KWT-x *** + row_kwt_sum = [0, 0, 0, 0, 0] + for _ in zipped_list: + + if float(_[2]) == 1: + row_kwt_sum[1] += (float(_[0])*float(_[1])) + elif float(_[2]) == 2: + row_kwt_sum[2] += (float(_[0])*float(_[1])) + elif float(_[2]) == 3: + row_kwt_sum[3] += (float(_[0])*float(_[1])) + row_kwt_sum[0] = sum(row_kwt_sum[1:4]) + row_kwt_sum[4] = sum(row_kwt_sum[1:3]) + result.append(i[:1]+multiply_by_weight+row_kwt_sum) ## concat with s10_data finale = []