From ac38f0183c1c0cf6ad28faa5d7a80c7a86b06a3d Mon Sep 17 00:00:00 2001 From: Dibyo Majumdar Date: Sun, 18 Oct 2015 02:51:20 -0700 Subject: [PATCH 1/2] Correct Table.hist label when counts arg is provided --- datascience/tables.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/datascience/tables.py b/datascience/tables.py index 2f22ab5fc..9e84f0173 100644 --- a/datascience/tables.py +++ b/datascience/tables.py @@ -1580,11 +1580,13 @@ def hist(self, overlay=False, bins=None, counts=None, **vargs): bins = np.unique(self[bins]) vargs['bins'] = bins - counted_values = None + counted_values = counted_label = None if counts is not None: counted_values = self._get_column(counts) + counted_label = 'counts' if isinstance(counts, collections.Hashable) and counts in self.column_labels: columns.pop(counts) + counted_label = counts n = len(columns) colors = [rgb_color + (self.default_hist_alpha,) for rgb_color in @@ -1606,11 +1608,12 @@ def hist(self, overlay=False, bins=None, counts=None, **vargs): for axis, label, color in zip(axes, columns.keys(), colors): if counted_values is None: values = columns[label] + axis.set_xlabel(label, fontsize=16) else: values = counted_values + axis.set_xlabel(counted_label, fontsize=16) vargs['weights'] = columns[label] axis.hist(values, color=color, **vargs) - axis.set_xlabel(label, fontsize=16) def points(self, column__lat, column__long, labels=None, colors=None, **kwargs) : latitudes = self._get_column(column__lat) From 359b14056c247fad05fbf5231a04834e43e2822e Mon Sep 17 00:00:00 2001 From: Dibyo Majumdar Date: Thu, 22 Oct 2015 00:53:44 -0700 Subject: [PATCH 2/2] Add doctest for histogram with counts arg set --- datascience/tables.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datascience/tables.py b/datascience/tables.py index 9e84f0173..f591ddf7e 100644 --- a/datascience/tables.py +++ b/datascience/tables.py @@ -1565,6 +1565,12 @@ def hist(self, overlay=False, bins=None, counts=None, **vargs): >>> table.hist() # doctest: +SKIP + + >>> value = [101, 102, 103] + >>> prop = [0.25, 0.5, 0.25] + >>> t = Table([value, prop], ['value', 'proportion']) + >>> t.hist(counts='value') # doctest: +SKIP + """ # Check for non-numerical values and raise a ValueError if any found for col in self: