add option to list out percentage

Author: jehiah

.gitignore

@@ -1 +1,2 @@
-build
+build
+dist

data_hacks/bar_chart.py

@@ -38,13 +38,17 @@ def load_stream(input_stream):
             yield clean_line
 
 def run(input_stream, options):
-    data = defaultdict(lambda:0)
+    data = defaultdict(int)
+    total = 0
     for row in input_stream:
         if options.agg_values:
             kv = row.replace('\t', ' ').split(' ',2);
-            data[kv[0]]+= int(kv[1])
+            value = int(kv[1])
+            data[kv[0]] += value
+            total += value
         else:
-            data[row]+=1
+            data[row] += 1
+            total += 1
 
     if not data:
         print "Error: no data"
@@ -57,7 +61,7 @@ def run(input_stream, options):
     scale = int(math.ceil(float(max_value) / value_characters))
     scale = max(1, scale)
 
-    print "# each ∎ represents a count of %d" % scale
+    print "# each ∎ represents a count of %d. total %d" % (scale, total)
 
     if options.sort_values:
         data = [[value, key] for key, value in data.items()]
@@ -71,9 +75,12 @@ def run(input_stream, options):
         else:
             data.sort(key=lambda x: x[1], reverse=options.reverse_sort)
 
-    format = "%" + str(max_length) + "s [%6d] %s"
-    for value,key in data:
-        print format % (key[:max_length], value, (value / scale) * "∎")
+    str_format = "%" + str(max_length) + "s [%6d] %s%s"
+    percentage = ""
+    for value, key in data:
+        if options.percentage:
+            percentage = " (%0.2f%%)" % (100 * Decimal(value) / Decimal(total))
+        print str_format % (key[:max_length], value, (value / scale) * "∎", percentage)
 
 if __name__ == "__main__":
     parser = OptionParser()
@@ -88,6 +95,8 @@ def run(input_stream, options):
                         help="reverse the sort")
     parser.add_option("-n", "--numeric-sort", dest="numeric_sort", default=False, action="store_true",
                         help="sort keys by numeric sequencing")
+    parser.add_option("-p", "--percentage", dest="percentage", default=False, action="store_true",
+                        help="List percentage for each bar")
 
     (options, args) = parser.parse_args()
 

data_hacks/histogram.py

@@ -202,14 +202,18 @@ def histogram(stream, options):
     print "# each ∎ represents a count of %d" % bucket_scale
     bucket_min = min_v
     bucket_max = min_v
+    percentage = ""
+    format_string = options.format + ' - ' + options.format + ' [%6d]: %s%s'
     for bucket in range(buckets):
         bucket_min = bucket_max
         bucket_max = boundaries[bucket]
         bucket_count = bucket_counts[bucket]
         star_count = 0
         if bucket_count:
             star_count = bucket_count / bucket_scale
-        print '%10.4f - %10.4f [%6d]: %s' % (bucket_min, bucket_max, bucket_count, '∎' * star_count)
+        if options.percentage:
+            percentage = " (%0.2f%%)" % (100 * Decimal(bucket_count) / Decimal(samples))
+        print format_string % (bucket_min, bucket_max, bucket_count, '∎' * star_count, percentage)
 
 
 if __name__ == "__main__":
@@ -227,6 +231,10 @@ def histogram(stream, options):
                         help="Comma seperated list of bucket edges for the histogram")
     parser.add_option("--no-mvsd", dest="mvsd", action="store_false", default=True,
                         help="Disable the calculation of Mean, Variance and SD (improves performance)")
+    parser.add_option("-f", "--bucket-format", dest="format", default="%10.4f",
+                        help="format for bucket numbers")
+    parser.add_option("-p", "--percentage", dest="percentage", default=False, action="store_true",
+                        help="List percentage for each bar")
 
     (options, args) = parser.parse_args()
     if sys.stdin.isatty():