From 16dfc8df20c6befeed423217a2e0f5ae59b5a04d Mon Sep 17 00:00:00 2001 From: Jonathan Herman Date: Mon, 18 Mar 2013 13:15:42 -0400 Subject: Use smarter defaults which can handle data from Bjorns scripts. --- parse/dir_map.py | 3 +++ parse/ft.py | 2 +- parse/point.py | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'parse') diff --git a/parse/dir_map.py b/parse/dir_map.py index 601dd3b..a8d2a83 100644 --- a/parse/dir_map.py +++ b/parse/dir_map.py @@ -56,6 +56,9 @@ class DirMap(object): remove_childless2(self.root) + def is_empty(self): + return not len(self.root.children) + def write(self, out_dir): def write2(path, node): out_path = "/".join(path) diff --git a/parse/ft.py b/parse/ft.py index 19453d1..98405f4 100644 --- a/parse/ft.py +++ b/parse/ft.py @@ -63,7 +63,7 @@ def extract_ft_data(result, data_dir, work_dir, cycles): data_dir = os.path.abspath(data_dir) work_dir = os.path.abspath(work_dir) - freg = conf.FILES['ft_data'] + "$" + freg = conf.FILES['ft_matches'] + "$" bins = [f for f in os.listdir(data_dir) if re.match(freg, f)] if not len(bins): diff --git a/parse/point.py b/parse/point.py index d577306..f2b266a 100644 --- a/parse/point.py +++ b/parse/point.py @@ -128,8 +128,7 @@ class ExpPoint(object): self.stats[type] = value def __str__(self): - # return "\n%s" % (self.id, dict_str(self.stats)) - return "" % (self.id) + return "\n%s" % (self.id, dict_str(self.stats)) def get_stats(self): return self.stats.keys() -- cgit v1.2.2