--- a/python/moving.py	Sun Nov 07 01:09:50 2010 -0500
+++ b/python/moving.py	Sun Nov 07 01:34:43 2010 -0500
@@ -407,11 +407,11 @@
         indicatorMap[k] = mean(indicatorMap[k])
     return indicatorMap
 
-def combineIndicatorMaps(maps, squareSize):
+def combineIndicatorMaps(maps, squareSize, combinationFunction):
     '''Puts many indicator maps together 
     (averaging the values in each cell 
     if more than one maps has a value)'''
-    from numpy import mean
+    #from numpy import mean
     indicatorMap = {}
     for m in maps:
         for k,v in m.iteritems():
@@ -420,7 +420,7 @@
             else:
                 indicatorMap[k] = [v]
     for k in indicatorMap.keys():
-        indicatorMap[k] = mean(indicatorMap[k])
+        indicatorMap[k] = combinationFunction(indicatorMap[k])
     return indicatorMap
 
 if __name__ == "__main__":