aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xparse_exps.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/parse_exps.py b/parse_exps.py
index 8fcf5c3..ee1462c 100755
--- a/parse_exps.py
+++ b/parse_exps.py
@@ -19,13 +19,10 @@ from parse.col_map import ColMapBuilder
19from multiprocessing import Pool, cpu_count 19from multiprocessing import Pool, cpu_count
20 20
21def parse_args(): 21def parse_args():
22 # TODO: convert data-dir to proper option, clean 'dest' options
23 parser = OptionParser("usage: %prog [options] [data_dir]...") 22 parser = OptionParser("usage: %prog [options] [data_dir]...")
24 23
25 parser.add_option('-o', '--out', dest='out', 24 parser.add_option('-o', '--out', dest='out',
26 help='file or directory for data output', default='parse-data') 25 help='file or directory for data output', default='parse-data')
27 parser.add_option('-c', '--clean', action='store_true', default=False,
28 dest='clean', help='do not output single-point csvs')
29 parser.add_option('-i', '--ignore', metavar='[PARAM...]', default="", 26 parser.add_option('-i', '--ignore', metavar='[PARAM...]', default="",
30 help='ignore changing parameter values') 27 help='ignore changing parameter values')
31 parser.add_option('-f', '--force', action='store_true', default=False, 28 parser.add_option('-f', '--force', action='store_true', default=False,
@@ -59,7 +56,7 @@ def get_exp_params(data_dir, cm_builder):
59 return params 56 return params
60 57
61 58
62def load_exps(exp_dirs, cm_builder, clean): 59def load_exps(exp_dirs, cm_builder, force):
63 exps = [] 60 exps = []
64 61
65 sys.stderr.write("Loading experiments...\n") 62 sys.stderr.write("Loading experiments...\n")
@@ -71,7 +68,7 @@ def load_exps(exp_dirs, cm_builder, clean):
71 # Used to store error output and debugging info 68 # Used to store error output and debugging info
72 work_dir = data_dir + "/tmp" 69 work_dir = data_dir + "/tmp"
73 70
74 if os.path.exists(work_dir) and clean: 71 if os.path.exists(work_dir) and force:
75 sh.rmtree(work_dir) 72 sh.rmtree(work_dir)
76 if not os.path.exists(work_dir): 73 if not os.path.exists(work_dir):
77 os.mkdir(work_dir) 74 os.mkdir(work_dir)