2 files changed, 17 insertions, 8 deletions

diff --git a/parse/point.py b/parse/point.py
index ce9cfb0..d577306 100644
--- a/parse/point.py
+++ b/parse/point.py
@@ -8,9 +8,9 @@ from enum import Enum
 from collections import defaultdict
 
 Type = Enum(['Min','Max','Avg','Var'])
-default_typemap = {Type.Max : {Type.Max : 1, Type.Min : 0, Type.Avg : 1, Type.Var : 1},
-                   Type.Min : {Type.Max : 1, Type.Min : 0, Type.Avg : 1, Type.Var : 1},
-                   Type.Avg : {Type.Max : 1, Type.Min : 0, Type.Avg : 1, Type.Var : 1}}
+default_typemap = {Type.Max : {Type.Max : 1, Type.Min : 1, Type.Avg : 1, Type.Var : 1},
+                   Type.Min : {Type.Max : 1, Type.Min : 1, Type.Avg : 1, Type.Var : 1},
+                   Type.Avg : {Type.Max : 1, Type.Min : 1, Type.Avg : 1, Type.Var : 1}}
 
 def make_typemap():
     return copy.deepcopy(default_typemap)
diff --git a/parse/tuple_table.py b/parse/tuple_table.py
index 105b786..86baa08 100644
--- a/parse/tuple_table.py
+++ b/parse/tuple_table.py
@@ -27,6 +27,9 @@ class TupleTable(object):
         key = self.col_map.get_key(kv)
         return key in self.table
 
+    def __iter__(self):
+        return self.table.iteritems()
+
     def reduce(self):
         reduced = ReducedTupleTable(self.col_map)
         for key, value in self.table.iteritems():
@@ -92,21 +95,27 @@ class ReducedTupleTable(TupleTable):
     def from_dir_map(dir_map):
         Leaf = namedtuple('Leaf', ['stat', 'variable', 'base',
                                    'summary', 'config', 'values'])
+
+        def next_type(path):
+            return path.pop() if path[-1] in Type else Type.Avg
+
         def leafs():
             for path, node in dir_map.leafs():
                 # The path will be of at least size 1: the filename
                 leaf = path.pop()
 
-                # Set acceptable defaults for the rest of the path
-                path += ['?', '?', 'Avg', 'Avg'][len(path):]
+                base = path.pop() if (path and path[-1] in Type) else Type.Avg
+                summ = path.pop() if (path and path[-1] in Type) else Type.Avg
+
+                path += ['?', '?'][len(path):]
 
-                [stat, variable, base_type, summary_type] = path
+                [stat, variable] = path
 
                 config_str = leaf[:leaf.index('.csv')]
                 config = ColMap.decode(config_str)
 
-                leaf = Leaf(stat, variable, base_type,
-                            summary_type, config, node.values)
+                leaf = Leaf(stat, variable, base, summ,
+                            config, node.values)
                 yield leaf
 
         builder = ColMapBuilder()