Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Feature stack base #1671

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
dmcdougall merged 9 commits into from
Jan 27, 2013
Merged

Feature stack base #1671

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24f537f
[ENH] added baseline feature to stacked graph.
Tillsten Jan 10, 2013
b21b348
pep8 compliance
Tillsten Jan 10, 2013
6f7a769
Fix typos
dmcdougall Jan 16, 2013
6975bcb
Add stackplot baseline demo
dmcdougall Jan 16, 2013
ff8cce4
Update changelog and whats_new
dmcdougall Jan 16, 2013
6dc5887
Add stackplot baseline test
dmcdougall Jan 16, 2013
f318d39
Remove text from regression test output
dmcdougall Jan 17, 2013
339ca4e
Vectorise the loops
dmcdougall Jan 17, 2013
6b4678b
Add docstring to example funtion
dmcdougall Jan 22, 2013
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
Prev Previous commit
Next Next commit
pep8 compliance
  • Loading branch information
@Tillsten @dmcdougall
Tillsten authored and dmcdougall committed Jan 26, 2013
commit b21b34887cd4602474b064bb9e489e6c40e1b5b4
29 changes: 15 additions & 14 deletions lib/matplotlib/stackplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ def stackplot(axes, x, *args, **kwargs):

baseline = kwargs.pop('baseline', 'zero')
# Assume data passed has not been 'stacked', so stack it here.
y_stack = np.cumsum(y, axis=0)
stack = np.cumsum(y, axis=0)

r = []
if baseline == 'zero':
first_line = 0.

elif baseline == 'sym':
first_line = -np.sum(y, 0) * 0.5
y_stack += first_line[None, :]
first_line = -np.sum(y, 0) * 0.5
stack += first_line[None, :]

elif baseline == 'wiggle':
m = y.shape[0]
first_line = (y * (m - 0.5 - np.arange(0, m)[:, None])).sum(0)
first_line /= -m
y_stack += first_line
stack += first_line

elif baseline == 'weighted_wiggle':
#TODO: Vectorize this stuff.
Expand All @@ -83,29 +83,30 @@ def stackplot(axes, x, *args, **kwargs):
for j in range(m):
if i == 0:
increase = y[j, i]
moveUp = 0.5
move_up = 0.5
else:
belowSize = 0.5 * y[j, i]
below_size = 0.5 * y[j, i]
for k in range(j + 1, m):
belowSize += y[k, i]
below_size += y[k, i]
increase = y[j, i] - y[j, i - 1]
moveUp = belowSize / total[i]
center[i] += (moveUp - 0.5) * increase
move_up = below_size / total[i]
center[i] += (move_up - 0.5) * increase
first_line = center - 0.5 * total
y_stack += first_line
stack += first_line
else:
errstr = "Baseline method %s not recognised. " % baseline
errstr += "Expected 'zero', 'sym', 'wiggle' or 'weighted_wiggle'"
raise ValueError(errstr)

# Color between x = 0 and the first array.
r.append(axes.fill_between(x, first_line, y_stack[0,:],
r.append(axes.fill_between(x, first_line, stack[0, :],
facecolor=axes._get_lines.color_cycle.next(),
**kwargs))

# Color between array i-1 and array i
for i in xrange(len(y)-1):
r.append(axes.fill_between(x, y_stack[i,: ], y_stack[i + 1, :],
facecolor=axes._get_lines.color_cycle.next(),
for i in xrange(len(y) - 1):
color = axes._get_lines.color_cycle.next()
r.append(axes.fill_between(x, stack[i, :], stack[i + 1, :],
facecolor= color,
**kwargs))
return r