diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-28 11:18:35 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-28 11:18:35 -0400 |
| commit | e9c71d9c11628b24fd7661d7473841fbda43cdda (patch) | |
| tree | 20f273ded9ba842b24edbc3931ffe09d30eef711 | |
| parent | 0ff824061ff5a58d25e64453dd0abc800d8db933 (diff) | |
Only create csvs of varying number values, not strings.
| -rw-r--r-- | parse/sched.py | 4 | ||||
| -rw-r--r-- | parse/tuple_table.py | 12 | ||||
| -rwxr-xr-x | parse_exps.py | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/parse/sched.py b/parse/sched.py index ec4d917..a84aece 100644 --- a/parse/sched.py +++ b/parse/sched.py | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | """ | ||
| 2 | TODO: make regexes indexable by name | ||
| 3 | """ | ||
| 4 | |||
| 1 | import config.config as conf | 5 | import config.config as conf |
| 2 | import os | 6 | import os |
| 3 | import re | 7 | import re |
diff --git a/parse/tuple_table.py b/parse/tuple_table.py index df80b37..0cf6bec 100644 --- a/parse/tuple_table.py +++ b/parse/tuple_table.py | |||
| @@ -66,11 +66,15 @@ class TupleTable(object): | |||
| 66 | 66 | ||
| 67 | for col in self.col_map.columns(): | 67 | for col in self.col_map.columns(): |
| 68 | val = kv[col] | 68 | val = kv[col] |
| 69 | kv.pop(col) | ||
| 70 | 69 | ||
| 71 | dir_map.add_point(col, val, kv, point) | 70 | try: |
| 72 | 71 | float(val) | |
| 73 | kv[col] = val | 72 | kv.pop(col) |
| 73 | dir_map.add_point(col, val, kv, point) | ||
| 74 | kv[col] = val | ||
| 75 | except: | ||
| 76 | # Only vary numbers. Otherwise, just have seperate lines | ||
| 77 | continue | ||
| 74 | 78 | ||
| 75 | dir_map.reduce() | 79 | dir_map.reduce() |
| 76 | dir_map.write() | 80 | dir_map.write() |
diff --git a/parse_exps.py b/parse_exps.py index 6a7d14f..ecb1cac 100755 --- a/parse_exps.py +++ b/parse_exps.py | |||
| @@ -3,15 +3,14 @@ from __future__ import print_function | |||
| 3 | 3 | ||
| 4 | import config.config as conf | 4 | import config.config as conf |
| 5 | import os | 5 | import os |
| 6 | |||
| 7 | import parse.ft as ft | 6 | import parse.ft as ft |
| 8 | import parse.sched as st | 7 | import parse.sched as st |
| 9 | 8 | ||
| 10 | from collections import namedtuple | 9 | from collections import namedtuple |
| 11 | from common import load_params | 10 | from common import load_params |
| 12 | from optparse import OptionParser | 11 | from optparse import OptionParser |
| 13 | from parse.tuple_table import ColMap,TupleTable | ||
| 14 | from parse.point import ExpPoint | 12 | from parse.point import ExpPoint |
| 13 | from parse.tuple_table import ColMap,TupleTable | ||
| 15 | 14 | ||
| 16 | def parse_args(): | 15 | def parse_args(): |
| 17 | parser = OptionParser("usage: %prog [options] [data_dir]...") | 16 | parser = OptionParser("usage: %prog [options] [data_dir]...") |
