Merge pull request #30 from mateidavid/master

allow user-specified dot character

2 files changed, 7 insertions, 5 deletions

diff --git a/data_hacks/bar_chart.py b/data_hacks/bar_chart.py
index 13f76a8..c68af8b 100755
--- a/data_hacks/bar_chart.py
+++ b/data_hacks/bar_chart.py
@@ -66,7 +66,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. total %d" % (scale, total)
+    print "# each " + options.dot + " represents a count of %d. total %d" % (scale, total)
     
     if options.sort_values:
         data = [[value, key] for key, value in data.items()]
@@ -85,7 +85,7 @@ def run(input_stream, options):
     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)
+        print str_format % (key[:max_length], value, (value / scale) * options.dot, percentage)
 
 if __name__ == "__main__":
     parser = OptionParser()
@@ -104,7 +104,8 @@ if __name__ == "__main__":
                         help="sort keys by numeric sequencing")
     parser.add_option("-p", "--percentage", dest="percentage", default=False, action="store_true",
                         help="List percentage for each bar")
-    
+    parser.add_option("--dot", dest="dot", default='∎', help="Dot representation")
+
     (options, args) = parser.parse_args()
     
     if sys.stdin.isatty():
diff --git a/data_hacks/histogram.py b/data_hacks/histogram.py
index 04dcf68..3d16cc8 100755
--- a/data_hacks/histogram.py
+++ b/data_hacks/histogram.py
@@ -241,7 +241,7 @@ def histogram(stream, options):
         print("# Mean = %f; Variance = %f; SD = %f; Median %f" %
               (mvsd.mean(), mvsd.var(), mvsd.sd(),
                median(accepted_data, key=lambda x: x.value)))
-    print "# each ∎ represents a count of %d" % bucket_scale
+    print "# each " + options.dot + " represents a count of %d" % bucket_scale
     bucket_min = min_v
     bucket_max = min_v
     percentage = ""
@@ -256,7 +256,7 @@ def histogram(stream, options):
         if options.percentage:
             percentage = " (%0.2f%%)" % (100 * Decimal(bucket_count) /
                                          Decimal(samples))
-        print format_string % (bucket_min, bucket_max, bucket_count, '∎' *
+        print format_string % (bucket_min, bucket_max, bucket_count, options.dot *
                                star_count, percentage)
 
 
@@ -288,6 +288,7 @@ if __name__ == "__main__":
                       help="format for bucket numbers")
     parser.add_option("-p", "--percentage", dest="percentage", default=False,
                       action="store_true", help="List percentage for each bar")
+    parser.add_option("--dot", dest="dot", default='∎', help="Dot representation")
 
     (options, args) = parser.parse_args()
     if sys.stdin.isatty():