make summarizer_to_tuple_list an argument to CombineIntoList

AlphaTwirl/Collector/CombineIntoList.py

@@ -3,12 +3,51 @@
 import collections
 from functions import *
 
+##__________________________________________________________________||
+def summarizer_to_key_vals_dict(summarizer):
+
+    ret = collections.OrderedDict([(k, v.contents) for k, v in summarizer.results().iteritems()])
+    # e.g.,
+    # OrderedDict([
+    #     ((200, 2), [array([120, 240])]),
+    #     ((300, 2), [array([490, 980])]),
+    #     ((300, 3), [array([210, 420])])
+    # ])
+
+    return ret
+
+##__________________________________________________________________||
+def summarizer_to_tuple_list(summarizer, sort):
+
+    key_vals_dict = summarizer_to_key_vals_dict(summarizer)
+    # e.g.,
+    # OrderedDict([
+    #     ((200, 2), [array([120, 240])]),
+    #     ((300, 2), [array([490, 980])]),
+    #     ((300, 3), [array([210, 420])])
+    # ])
+
+    tuple_list = convert_key_vals_dict_to_tuple_list(key_vals_dict, fill = 0, sort = sort)
+    # e.g.,
+    # [
+    #     (200, 2, 120, 240),
+    #     (300, 2, 490, 980),
+    #     (300, 3, 210, 420)
+    # ]
+
+    return tuple_list
+
 ##__________________________________________________________________||
 class CombineIntoList(object):
-    def __init__(self, summaryColumnNames, sort = True, datasetColumnName = 'component'):
+    def __init__(self, summaryColumnNames,
+                 sort = True,
+                 datasetColumnName = 'component',
+                 summarizer_to_tuple_list = summarizer_to_tuple_list):
+
         self.summaryColumnNames = summaryColumnNames
         self.sort = sort
         self.datasetColumnName = datasetColumnName
+        self.summarizer_to_tuple_list = summarizer_to_tuple_list
 
     def __repr__(self):
         return '{}(summaryColumnNames = {!r}, sort = {!r}, datasetColumnName = {!r})'.format(
@@ -51,7 +90,7 @@ def combine(self, datasetReaderPairs):
 
         dataset_tuple_list_pairs = [ ]
         for dataset, summarizer in dataset_summarizer_pairs:
-            tuple_list = summarizer_to_tuple_list(summarizer, sort = self.sort)
+            tuple_list = self.summarizer_to_tuple_list(summarizer, sort = self.sort)
             dataset_tuple_list_pairs.append((dataset, tuple_list))
         # e.g.,
         # dataset_tuple_list_pairs = [
@@ -95,37 +134,3 @@ def combine(self, datasetReaderPairs):
         return ret
 
 ##__________________________________________________________________||
-def summarizer_to_key_vals_dict(summarizer):
-
-    ret = collections.OrderedDict([(k, v.contents) for k, v in summarizer.results().iteritems()])
-    # e.g.,
-    # OrderedDict([
-    #     ((200, 2), [array([120, 240])]),
-    #     ((300, 2), [array([490, 980])]),
-    #     ((300, 3), [array([210, 420])])
-    # ])
-
-    return ret
-
-##__________________________________________________________________||
-def summarizer_to_tuple_list(summarizer, sort):
-
-    key_vals_dict = summarizer_to_key_vals_dict(summarizer)
-    # e.g.,
-    # OrderedDict([
-    #     ((200, 2), [array([120, 240])]),
-    #     ((300, 2), [array([490, 980])]),
-    #     ((300, 3), [array([210, 420])])
-    # ])
-
-    tuple_list = convert_key_vals_dict_to_tuple_list(key_vals_dict, fill = 0, sort = sort)
-    # e.g.,
-    # [
-    #     (200, 2, 120, 240),
-    #     (300, 2, 490, 980),
-    #     (300, 3, 210, 420)
-    # ]
-
-    return tuple_list
-
-##__________________________________________________________________||