Money, Rate, CentCount and a bunch of bugfixes.

[python_utils.git] / histogram.py

diff --git a/histogram.py b/histogram.py
index b98e8489c030de0b816c6815766a69c677599028..0368376434c3579014cf97974e3e6e381f494872 100644 (file)
--- a/histogram.py
+++ b/histogram.py
@@ -66,7 +66,8 @@ class SimpleHistogram(Generic[T]):
             all_true = all_true and self.add_item(item)
         return all_true
 
-    def __repr__(self) -> str:
+    def __repr__(self,
+                 label_formatter='%10s') -> str:
         from text_utils import bar_graph
         max_population: Optional[int] = None
         for bucket in self.buckets:
@@ -86,17 +87,11 @@ class SimpleHistogram(Generic[T]):
             bar = bar_graph(
                 (pop / max_population),
                 include_text = False,
-                width = 70,
+                width = 58,
                 left_end = "",
                 right_end = "")
-            label = f'{start}..{end}'
-            txt += f'{label:12}: ' + bar + f"({pop}) ({len(bar)})\n"
+            label = f'{label_formatter}..{label_formatter}' % (start, end)
+            txt += f'{label:20}: ' + bar + f"({pop/self.count*100.0:5.2f}% n={pop})\n"
             if start == last_bucket_start:
                 break
-
-        txt = txt + f'''{self.count} item(s)
-{self.maximum} max
-{self.minimum} min
-{self.sigma/self.count:.3f} mean
-{self.median.get_median()} median'''
         return txt