diff --git a/s1.py b/s1.py index d42e03b..9ca79ff 100755 --- a/s1.py +++ b/s1.py @@ -1,5 +1,8 @@ -# -*- coding:utf-8 -*- #!/usr/bin/env python +# -*- coding:utf-8 -*- +''' +Step 1 +''' from __future__ import print_function from base import Lo, RAW_DIR, TARGET_DIR import os diff --git a/s2.py b/s2.py index a7c56b8..9a378f8 100755 --- a/s2.py +++ b/s2.py @@ -1,5 +1,8 @@ -# -*- coding:utf-8 -*- #!/usr/bin/env python +# -*- coding:utf-8 -*- +''' +Step 2 +''' from __future__ import print_function from base import Lo, create_csv, TARGET_DIR import os diff --git a/s3.py b/s3.py index 06da602..91e62b0 100755 --- a/s3.py +++ b/s3.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- ''' -WTH +Step 3 ''' -# -*- coding:utf-8 -*- -#!/usr/bin/env python from __future__ import print_function from base import Lo, create_csv, TARGET_DIR import os diff --git a/s4.py b/s4.py index 06f69ed..0224e4d 100755 --- a/s4.py +++ b/s4.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- ''' Step 4 ''' -# -*- coding:utf-8 -*- -#!/usr/bin/env python from __future__ import print_function from base import Lo, create_csv, TARGET_DIR import os diff --git a/s5.py b/s5.py index cc42052..0e61ef5 100644 --- a/s5.py +++ b/s5.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- ''' Step 5 ''' -# -*- coding:utf-8 -*- -#!/usr/bin/env python from __future__ import print_function from base import create_csv, TARGET_DIR, MODEL_LIST import os diff --git a/s6.py b/s6.py index fdf93d0..31ce8ae 100644 --- a/s6.py +++ b/s6.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python +# -*- coding:utf-8 -*- ''' Step 6 ''' -# -*- coding:utf-8 -*- -#!/usr/bin/env python from __future__ import print_function from base import create_csv, TARGET_DIR, MODEL_LIST import os diff --git a/s7.py b/s7.py index 8914a22..50343b0 100644 --- a/s7.py +++ b/s7.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python # -*- coding:utf-8 -*- ''' Step 7 ''' -#!/usr/bin/env python from __future__ import print_function from base import create_csv, TARGET_DIR, MODEL_LIST import os @@ -17,12 +17,21 @@ No of R ของคุณ ======= TOTAL -- ถ้าต้องการทั แต่ว่า ผมไม่รับรองว่าจะใช้ได้ทั้งหมดเพราะว่า มันก็ขึ้นกับหลายอย่าง เช่น 1Ts มีไม่กี่อันอาจจะ error มั้ง? โดยเฉพาะเวลา random ''' -NOT_ARG = '2Ts' +NOT_ARG = '3Ts' TOTAL = 20 SRC_PATH = os.path.join(TARGET_DIR, 'part6') +def get_yynn_count(cols): + n = 0 + for c in cols: + if c in ('Y', 'Y*', 'N', 'N*'): + n += 1 + elif c in ('Y/N', 'Y/N*'): + n += 2 + return n + def get_by_order(): for m in MODEL_LIST: result = [] @@ -38,6 +47,7 @@ def get_by_order(): r[2], # No of Tree m, # model ] + r[7:] + row.append(get_yynn_count(r[7:])) # ?????????? result.append(row) count += 1 if count >= TOTAL and TOTAL > 0: @@ -60,6 +70,7 @@ def get_by_random(): r[2], # No of Tree m, # model ] + r[7:] + l.append(get_yynn_count(r[7:])) # ?????????? lo_list.append(l) picked = [] @@ -111,6 +122,7 @@ def get_by_group(model_name, step, **kwargs): _r[i] = '%s*' % calibrator[i] else: # one Y one N _r[i] = 'Y/N*' + _r.append(get_yynn_count(r[7:])) # ?????????? result.append(_r) calibrator = _r[:] diff --git a/s8.py b/s8.py old mode 100644 new mode 100755 index 933111a..c5ff574 --- a/s8.py +++ b/s8.py @@ -1,8 +1,8 @@ +#!/usr/bin/env python # -*- coding:utf-8 -*- ''' -Step 7 +Step 8 ''' -#!/usr/bin/env python from __future__ import print_function from base import create_csv, TARGET_DIR, MODEL_LIST, RAW_DIR import os