Refactored stats module to be an output module

Previously this was an "intermediate" module. Makes more sense
to have it as an output module.

1 files changed, 17 insertions, 14 deletions

diff --git a/unit-trace b/unit-trace
index d0921d5..81b6c02 100755
--- a/unit-trace
+++ b/unit-trace
@@ -15,7 +15,7 @@ import unit_trace
 from unit_trace import trace_reader
 from unit_trace import sanitizer
 from unit_trace import gedf_test
-from unit_trace import stats
+from unit_trace import gedf_inversion_stat_printer
 from unit_trace import stdout_printer
 from unit_trace import viz
 from unit_trace import progress
@@ -90,10 +90,6 @@ if options.progress is True:
 if options.gedf is True:
     stream = gedf_test.gedf_test(stream)
 
-# Produce a statistics record
-if options.num_inversions > -1:
-    stream = stats.stats(stream,options.num_inversions)
-
 # Filter some records out
 #def my_filter(record):
 #    if record.record_type == 'error' and record.type_name == 'inversion_end':
@@ -102,13 +98,20 @@ if options.num_inversions > -1:
 #    return True
 #stream = filter(my_filter, stream)
 
-# Output
-if options.stdout is True and options.visualize is True:
-    import itertools
-    stream1, stream2 = itertools.tee(stream,2)
+# Tee by the number of possible outputs
+# This might cause a performance bottleneck that could be eliminated by
+# checking how many we actually need :-)
+import itertools
+stream1, stream2, stream3 = itertools.tee(stream,3)
+
+# Call standard out printer
+if options.stdout is True:
     stdout_printer.stdout_printer(stream1)
-    viz.visualizer.visualizer(stream2) 
-elif options.stdout is True:
-    stdout_printer.stdout_printer(stream)
-elif options.visualize is True:
-    viz.visualizer.visualizer(stream)
+
+# Print G_EDF inversion statistics
+if options.num_inversions > -1:
+    gedf_inversion_stat_printer.gedf_inversion_stat_printer(stream2,options.num_inversions)
+
+# Call visualizer
+if options.visualize is True:
+    viz.visualizer.visualizer(stream3)