Correcting the implementation of the ascii() method.

Author: jpivarski

histogrammar/primitives/bin.py

@@ -144,30 +144,25 @@ def __init__(self, num, low, high, quantity, value=Count(), underflow=Count(), o
 
     def ascii(self):
         """Prints ascii histogram, for debuging on headless machines"""
-        underflow = self.underflow.toInt()
-        overflow = self.overflow.toInt()
-        nanflow = self.nanflow.toInt()
-        values = [underflow] + self._toArray() + [overflow, nanflow]
-        min = values[0]
-        max = values[0]
-
-        length = len(values)
-        i = 1
-        while i < length:
-            if values[i] > max:
-                max = values[i]
-            elif values[i] < min:
-                min = values[i]
-            i += 1
-        
+        underflow = self.underflow.entries
+        overflow = self.overflow.entries
+        nanflow = self.nanflow.entries
+        values = [underflow] + [x.entries for x in self.values] + [overflow, nanflow]
+        minimum = min(values)
+        maximum = max(values)
+
         # Map values to number of dots representing them (maximum is 63)
-        range = max - min
-        prop = 63 / range
+        mintomax = maximum - minimum
+        if mintomax == 0.0:
+            mintomax = 1.0
+
+        prop = 62.0 / mintomax
 
+        length = len(self.values)
         dots = [None] * length
         i = 0
         while i < length:
-            dots[i] = int((values[i] - min)*prop)
+            dots[i] = int(round((values[i] - minimum)*prop))
             i += 1
 
         # Get range of values corresponding to each bin
@@ -177,15 +172,19 @@ def ascii(self):
             ranges[i] = "[" + str(self.range(i))[1:]
             i += 1
 
-        print("{:>19}{:>65}".format(min, max))
-        print(" " * 18 + "+" + "-" * 63 + "+")
+        printedValues = ["{0:<.2g}".format(v) for v in values]
+        printedValuesWidth = max(len(x) for x in printedValues)
+        formatter = "{0:<14} {1:<%s} {2:<65}" % printedValuesWidth
+
+        print(" " * printedValuesWidth + "{0:>16}{1:>65}".format(minimum, maximum))
+        print(" " * (16 + printedValuesWidth) + "+" + "-" * 62 + "+")
 
         i = 0
         while i < length:
-            print("{:<14}{:<4}{:<65}".format(ranges[i], int(values[i]), "|" + "*" * dots[i] + " " * (63 - dots[i]) + "|"))
+            print(formatter.format(ranges[i], printedValues[i], "|" + "*" * dots[i] + " " * (62 - dots[i]) + "|"))
             i += 1
 
-        print(" " * 18 + "+" + "-" * 63 + "+")
+        print(" " * (16 + printedValuesWidth) + "+" + "-" * 62 + "+")
 
     def histogram(self):
         """Return a plain histogram by converting all sub-aggregator values into :doc:`Counts <histogrammar.primitives.count.Count>`."""
@@ -517,17 +516,6 @@ def _numpy(self, data, weights, shape):
     def _sparksql(self, jvm, converter):
         return converter.Bin(len(self.values), self.low, self.high, self.quantity.asSparkSQL(), self.values[0]._sparksql(jvm, converter), self.underflow._sparksql(jvm, converter), self.overflow._sparksql(jvm, converter), self.nanflow._sparksql(jvm, converter))
 
-    def _toArray(self):
-        """Converts Bin to array of frequencies"""
-        values = [None] * int(len(self.values))
-        i = 0
-        for value in self.values:
-            value = str(value)
-            end = len(value) - 1
-            values[i] = float(value[7:end])
-            i += 1
-        return values
-
     @property
     def children(self):
         """List of sub-aggregators, to make it possible to walk the tree."""

histogrammar/primitives/count.py

@@ -194,13 +194,6 @@ def _numpy(self, data, weights, shape):
     def _sparksql(self, jvm, converter):
         return converter.Count()   # TODO: handle transform
 
-    def toInt(self):
-        """Return intiger value of count"""
-        value = str(self)
-        end = len(value) - 1
-        value = float(value[7:end])
-        return int(value)
-
     @property
     def children(self):
         """List of sub-aggregators, to make it possible to walk the tree."""