Skip to content

fix bugs in charts #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2017
Merged

fix bugs in charts #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions datascience/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

class Table(collections.abc.MutableMapping):
"""A sequence of string-labeled columns."""
plots = []
plots = collections.deque(maxlen=10)

def __init__(self, labels=None, _deprecated=None, *, formatter=_formats.default_formatter):
"""Create an empty table with column labels.
Expand Down Expand Up @@ -2219,7 +2219,7 @@ def _visualize(self, x_label, y_labels, ticks, overlay, draw, annotate, width=6,
if ticks is not None:
annotate(axis, ticks)
axis.legend(y_labels, loc=2, bbox_to_anchor=(1.05, 1))
Table.plots.append(axis)
type(self).plots.append(axis)
else:
fig, axes = plt.subplots(n, 1, figsize=(width, height*n))
if not isinstance(axes, collections.Iterable):
Expand All @@ -2231,26 +2231,26 @@ def _visualize(self, x_label, y_labels, ticks, overlay, draw, annotate, width=6,
axis.set_xlabel(x_label, fontsize=16)
if ticks is not None:
annotate(axis, ticks)
Table.plots.append(axis)
type(self).plots.append(axis)

def _split_column_and_labels(self, column_or_label):
"""Return the specified column and labels of other columns."""
column = None if column_or_label is None else self._get_column(column_or_label)
labels = [label for i, label in enumerate(self.labels) if column_or_label not in (i, label)]
return column, labels

def pivot_hist(self, pivot_column_label, value_column_label, overlay=True, **vargs):
def pivot_hist(self, pivot_column_label, value_column_label, overlay=True, width=6, height=4, **vargs):
"""Draw histograms of each category in a column."""
pvt_labels = np.unique(self[pivot_column_label])
pvt_columns = [self[value_column_label][np.where(self[pivot_column_label] == pivot)] for pivot in pvt_labels]
n = len(pvt_labels)
colors = list(itertools.islice(itertools.cycle(self.chart_colors), n))
if overlay:
plt.figure(figsize=(6, 4))
plt.figure(figsize=(width, height))
vals, bins, patches = plt.hist(pvt_columns, color=colors, **vargs)
plt.legend(pvt_labels)
else:
_, axes = plt.subplots(n, 1, figsize=(6, 4 * n))
_, axes = plt.subplots(n, 1, figsize=(width, height * n))
vals = []
bins = None
for axis, label, column, color in zip(axes, pvt_labels, pvt_columns, colors):
Expand All @@ -2270,7 +2270,7 @@ def pivot_hist(self, pivot_column_label, value_column_label, overlay=True, **var
for label, column in zip(pvt_labels,vals):
t[label] = column

def hist(self, *columns, overlay=True, bins=None, bin_column=None, unit=None, counts=None, **vargs):
def hist(self, *columns, overlay=True, bins=None, bin_column=None, unit=None, counts=None, width=6, height=4, **vargs):
"""Plots one histogram for each column in columns. If no column is
specificed, plot all columns.

Expand Down Expand Up @@ -2359,7 +2359,7 @@ def hist(self, *columns, overlay=True, bins=None, bin_column=None, unit=None, co
vargs['weights'] = np.transpose(values)
values = np.repeat(counted_values, n).reshape(-1,n)
vargs.setdefault('histtype', 'stepfilled')
figure = plt.figure(figsize=(6, 4))
figure = plt.figure(figsize=(width, height))
plt.hist(values, color=colors, **vargs)
axis = figure.get_axes()[0]
_vertical_x(axis)
Expand All @@ -2371,9 +2371,9 @@ def hist(self, *columns, overlay=True, bins=None, bin_column=None, unit=None, co
if unit:
axis.set_xlabel('(' + unit + ')', fontsize=16)
plt.legend(columns.keys(), loc=2, bbox_to_anchor=(1.05, 1))
Table.plots.append(axis)
type(self).plots.append(axis)
else:
_, axes = plt.subplots(n, 1, figsize=(6, 4 * n))
_, axes = plt.subplots(n, 1, figsize=(width, height * n))
# Use stepfilled when there are too many bins
if isinstance(bins, numbers.Integral) and bins > 76 or hasattr(bins, '__len__') and len(bins) > 76:
vargs.setdefault('histtype', 'stepfilled')
Expand All @@ -2395,7 +2395,7 @@ def hist(self, *columns, overlay=True, bins=None, bin_column=None, unit=None, co
axis.set_xlabel(label.rstrip(' count') + x_unit, fontsize=16)
axis.hist(values, color=color, **vargs)
_vertical_x(axis)
Table.plots.append(axis)
type(self).plots.append(axis)

def boxplot(self, **vargs):
"""Plots a boxplot for the table.
Expand Down
Loading