1 files changed, 17 insertions, 19 deletions

diff --git a/dis/summarize.py b/dis/summarize.py
index f8f6929..31dcccc 100755
--- a/dis/summarize.py
+++ b/dis/summarize.py
@@ -2,6 +2,8 @@
 import sys
 
 f = sys.argv[1]
+if len(sys.argv) < 2:
+    print("Usage "+sys.argv[0]+" <filename> --inf-precision")
 res = {}
 mem_res = {}
 memw_res = {}
@@ -48,24 +50,20 @@ def percentile(N, percent, key=lambda x:x):
     d1 = key(N[int(c)]) * (k-f)
     return d0+d1
 ## end of http://code.activestate.com/recipes/511478/ }}}
-"""
-print("Average times:")
-for r in res.keys():
-    print(res[r]/samples[r])
-
-print("Average memory read:")
-for r in mem_res.keys():
-    print(mem_res[r]/samples[r])
-
-print("Average memory write:")
-for r in memw_res.keys():
-    print(memw_res[r]/samples[r])
-
-print("Max times:")
-for r in max_res.keys():
-    print(max_res[r])
-"""
+avg_max = 0
+avg_99th = 0
+avg_avg = 0
 print("Name\t\tAverage\t\tMax\t\t99th %\t\tAvg Mem Read\tAvg Mem Write\t")
-for r in res.keys():
+for r in sorted(res.keys()):
 #    print(r + "\t\t" + str(res[r]/samples[r]) + "\t\t" + str(max_res[r]))
-    print("{:12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99), mem_res[r]/samples[r], memw_res[r]/samples[r]))
+    avg_avg += sum(res[r])/len(res[r])
+    avg_max += max(res[r])
+    avg_99th += percentile(sorted(res[r]), 0.99)
+    if len(sys.argv) > 2 and sys.argv[2] == "--inf-precision":
+        print("{:12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99), mem_res[r]/samples[r], memw_res[r]/samples[r]))
+    else:
+        print("{:12.12}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}\t{:>12.0f}".format(r, sum(res[r])/len(res[r]), max(res[r]), percentile(sorted(res[r]), 0.99), mem_res[r]/samples[r], memw_res[r]/samples[r]))
+
+print("Average average:", avg_avg/len(res.keys()))
+print("Average max:", avg_max/len(res.keys()))
+print("Average 99th:", avg_99th/len(res.keys()))