Permalink
Browse files

Fix bug in stacked bar histogram. Also, calling hist with `log=True` now

behaves correctly in all cases.
  • Loading branch information...
1 parent 2e1a96d commit f6dfcead4f6bc16628e75b2f4d7d0ff1b34cca5e @neggert neggert committed Feb 23, 2013
View
24 lib/matplotlib/axes.py
@@ -4792,11 +4792,10 @@ def make_iterable(x):
if orientation == 'vertical':
self._process_unit_info(xdata=left, ydata=height, kwargs=kwargs)
if log:
- self.set_yscale('log')
+ self.set_yscale('log', nonposy = 'clip')
# size width and bottom according to length of left
if _bottom is None:
if self.get_yscale() == 'log':
- bottom = [1e-100]
adjust_ylim = True
else:
bottom = [0]
@@ -4808,11 +4807,10 @@ def make_iterable(x):
elif orientation == 'horizontal':
self._process_unit_info(xdata=width, ydata=bottom, kwargs=kwargs)
if log:
- self.set_xscale('log')
+ self.set_xscale('log', nonposx = 'clip')
# size left and height according to length of bottom
if _left is None:
if self.get_xscale() == 'log':
- left = [1e-100]
adjust_xlim = True
else:
left = [0]
@@ -8118,7 +8116,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
if normed:
db = np.diff(bins)
m = (m.astype(float) / db) / m.sum()
- if stacked:
+ if stacked :
m += mlast
mlast[:] = m
n.append(m)
@@ -8171,14 +8169,18 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
_barfunc = self.bar
for m, c in zip(n, color):
- patch = _barfunc(bins[:-1]+boffset, m, width, bottom,
+ if bottom is None:
+ bottom = np.zeros(len(m), np.float)
+ if stacked:
+ height = m-bottom
+ else :
+ height = m
+ patch = _barfunc(bins[:-1]+boffset, height, width, bottom,
align='center', log=log,
color=c, bottom=bottom)
patches.append(patch)
if stacked:
- if bottom is None:
- bottom = 0.0
- bottom += m
+ bottom[:] = m
boffset += dw
elif histtype.startswith('step'):
@@ -8191,10 +8193,10 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
if log:
if orientation == 'horizontal':
- self.set_xscale('log')
+ self.set_xscale('log', nonposx = 'clip')
logbase = self.xaxis._scale.base
else: # orientation == 'vertical'
- self.set_yscale('log')
+ self.set_yscale('log', nonposy = 'clip')
logbase = self.yaxis._scale.base
# Setting a minimum of 0 results in problems for log plots
View
BIN lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.pdf
Binary file not shown.
View
BIN lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1,360 lib/matplotlib/tests/baseline_images/test_axes/hist_stacked_bar.svg
@@ -30,183 +30,543 @@ z
</g>
<g id="patch_3">
<path clip-path="url(#p7ff5b81e1d)" d="
-M76.464 388.8
-L112.176 388.8
-L112.176 388.8
-L76.464 388.8
+M79.2261 388.8
+L114.715 388.8
+L114.715 365.76
+L79.2261 365.76
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_4">
<path clip-path="url(#p7ff5b81e1d)" d="
-M121.104 388.8
-L156.816 388.8
-L156.816 250.56
-L121.104 250.56
+M123.587 388.8
+L159.076 388.8
+L159.076 342.72
+L123.587 342.72
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_5">
<path clip-path="url(#p7ff5b81e1d)" d="
-M165.744 388.8
-L201.456 388.8
-L201.456 264.384
-L165.744 264.384
+M167.948 388.8
+L203.437 388.8
+L203.437 377.28
+L167.948 377.28
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_6">
<path clip-path="url(#p7ff5b81e1d)" d="
-M210.384 388.8
-L246.096 388.8
-L246.096 374.976
-L210.384 374.976
+M212.309 388.8
+L247.798 388.8
+L247.798 365.76
+L212.309 365.76
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_7">
<path clip-path="url(#p7ff5b81e1d)" d="
-M255.024 388.8
-L290.736 388.8
-L290.736 388.8
-L255.024 388.8
+M256.67 388.8
+L292.159 388.8
+L292.159 388.8
+L256.67 388.8
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_8">
<path clip-path="url(#p7ff5b81e1d)" d="
-M299.664 388.8
-L335.376 388.8
-L335.376 388.8
-L299.664 388.8
+M301.031 388.8
+L336.52 388.8
+L336.52 377.28
+L301.031 377.28
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_9">
<path clip-path="url(#p7ff5b81e1d)" d="
-M344.304 388.8
-L380.016 388.8
-L380.016 388.8
-L344.304 388.8
+M345.392 388.8
+L380.881 388.8
+L380.881 388.8
+L345.392 388.8
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_10">
<path clip-path="url(#p7ff5b81e1d)" d="
-M388.944 388.8
-L424.656 388.8
-L424.656 388.8
-L388.944 388.8
+M389.753 388.8
+L425.242 388.8
+L425.242 377.28
+L389.753 377.28
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_11">
<path clip-path="url(#p7ff5b81e1d)" d="
-M433.584 388.8
-L469.296 388.8
-L469.296 388.8
-L433.584 388.8
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_12">
<path clip-path="url(#p7ff5b81e1d)" d="
-M478.224 388.8
-L513.936 388.8
-L513.936 388.8
-L478.224 388.8
+M478.475 388.8
+L513.964 388.8
+L513.964 377.28
+L478.475 377.28
z
-" style="fill:#0000ff;stroke:#000000;"/>
+" style="fill:#93ff00;stroke:#000000;"/>
</g>
<g id="patch_13">
<path clip-path="url(#p7ff5b81e1d)" d="
-M76.464 388.8
-L112.176 388.8
-L112.176 319.68
-L76.464 319.68
+M79.2261 365.76
+L114.715 365.76
+L114.715 319.68
+L79.2261 319.68
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_14">
<path clip-path="url(#p7ff5b81e1d)" d="
-M121.104 250.56
-L156.816 250.56
-L156.816 43.2
-L121.104 43.2
+M123.587 342.72
+L159.076 342.72
+L159.076 331.2
+L123.587 331.2
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_15">
<path clip-path="url(#p7ff5b81e1d)" d="
-M165.744 264.384
-L201.456 264.384
-L201.456 70.848
-L165.744 70.848
+M167.948 377.28
+L203.437 377.28
+L203.437 377.28
+L167.948 377.28
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_16">
<path clip-path="url(#p7ff5b81e1d)" d="
-M210.384 374.976
-L246.096 374.976
-L246.096 292.032
-L210.384 292.032
+M212.309 365.76
+L247.798 365.76
+L247.798 365.76
+L212.309 365.76
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_17">
<path clip-path="url(#p7ff5b81e1d)" d="
-M255.024 388.8
-L290.736 388.8
-L290.736 319.68
-L255.024 319.68
+M256.67 388.8
+L292.159 388.8
+L292.159 388.8
+L256.67 388.8
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_18">
<path clip-path="url(#p7ff5b81e1d)" d="
-M299.664 388.8
-L335.376 388.8
-L335.376 319.68
-L299.664 319.68
+M301.031 377.28
+L336.52 377.28
+L336.52 365.76
+L301.031 365.76
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_19">
<path clip-path="url(#p7ff5b81e1d)" d="
-M344.304 388.8
-L380.016 388.8
-L380.016 319.68
-L344.304 319.68
+M345.392 388.8
+L380.881 388.8
+L380.881 388.8
+L345.392 388.8
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_20">
<path clip-path="url(#p7ff5b81e1d)" d="
-M388.944 388.8
-L424.656 388.8
-L424.656 319.68
-L388.944 319.68
+M389.753 377.28
+L425.242 377.28
+L425.242 377.28
+L389.753 377.28
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_21">
<path clip-path="url(#p7ff5b81e1d)" d="
-M433.584 388.8
-L469.296 388.8
-L469.296 319.68
-L433.584 319.68
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
</g>
<g id="patch_22">
<path clip-path="url(#p7ff5b81e1d)" d="
-M478.224 388.8
-L513.936 388.8
-L513.936 319.68
-L478.224 319.68
+M478.475 377.28
+L513.964 377.28
+L513.964 377.28
+L478.475 377.28
z
-" style="fill:#008000;stroke:#000000;"/>
+" style="fill:#00ff59;stroke:#000000;"/>
+ </g>
+ <g id="patch_23">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M79.2261 319.68
+L114.715 319.68
+L114.715 319.68
+L79.2261 319.68
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_24">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M123.587 331.2
+L159.076 331.2
+L159.076 262.08
+L123.587 262.08
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_25">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M167.948 377.28
+L203.437 377.28
+L203.437 365.76
+L167.948 365.76
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_26">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M212.309 365.76
+L247.798 365.76
+L247.798 365.76
+L212.309 365.76
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_27">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M256.67 388.8
+L292.159 388.8
+L292.159 388.8
+L256.67 388.8
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_28">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M301.031 365.76
+L336.52 365.76
+L336.52 365.76
+L301.031 365.76
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_29">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M345.392 388.8
+L380.881 388.8
+L380.881 388.8
+L345.392 388.8
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_30">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M389.753 377.28
+L425.242 377.28
+L425.242 377.28
+L389.753 377.28
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_31">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_32">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M478.475 377.28
+L513.964 377.28
+L513.964 377.28
+L478.475 377.28
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="patch_33">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M79.2261 319.68
+L114.715 319.68
+L114.715 216
+L79.2261 216
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_34">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M123.587 262.08
+L159.076 262.08
+L159.076 262.08
+L123.587 262.08
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_35">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M167.948 365.76
+L203.437 365.76
+L203.437 365.76
+L167.948 365.76
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_36">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M212.309 365.76
+L247.798 365.76
+L247.798 331.2
+L212.309 331.2
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_37">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M256.67 388.8
+L292.159 388.8
+L292.159 388.8
+L256.67 388.8
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_38">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M301.031 365.76
+L336.52 365.76
+L336.52 365.76
+L301.031 365.76
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_39">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M345.392 388.8
+L380.881 388.8
+L380.881 388.8
+L345.392 388.8
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_40">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M389.753 377.28
+L425.242 377.28
+L425.242 377.28
+L389.753 377.28
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_41">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_42">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M478.475 377.28
+L513.964 377.28
+L513.964 377.28
+L478.475 377.28
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_43">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M79.2261 216
+L114.715 216
+L114.715 135.36
+L79.2261 135.36
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_44">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M123.587 262.08
+L159.076 262.08
+L159.076 216
+L123.587 216
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_45">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M167.948 365.76
+L203.437 365.76
+L203.437 365.76
+L167.948 365.76
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_46">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M212.309 331.2
+L247.798 331.2
+L247.798 331.2
+L212.309 331.2
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_47">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M256.67 388.8
+L292.159 388.8
+L292.159 388.8
+L256.67 388.8
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_48">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M301.031 365.76
+L336.52 365.76
+L336.52 365.76
+L301.031 365.76
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_49">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M345.392 388.8
+L380.881 388.8
+L380.881 354.24
+L345.392 354.24
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_50">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M389.753 377.28
+L425.242 377.28
+L425.242 377.28
+L389.753 377.28
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_51">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_52">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M478.475 377.28
+L513.964 377.28
+L513.964 377.28
+L478.475 377.28
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_53">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M79.2261 135.36
+L114.715 135.36
+L114.715 89.28
+L79.2261 89.28
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_54">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M123.587 216
+L159.076 216
+L159.076 216
+L123.587 216
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_55">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M167.948 365.76
+L203.437 365.76
+L203.437 365.76
+L167.948 365.76
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_56">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M212.309 331.2
+L247.798 331.2
+L247.798 331.2
+L212.309 331.2
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_57">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M256.67 388.8
+L292.159 388.8
+L292.159 296.64
+L256.67 296.64
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_58">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M301.031 365.76
+L336.52 365.76
+L336.52 365.76
+L301.031 365.76
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_59">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M345.392 354.24
+L380.881 354.24
+L380.881 354.24
+L345.392 354.24
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_60">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M389.753 377.28
+L425.242 377.28
+L425.242 377.28
+L389.753 377.28
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_61">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M434.114 388.8
+L469.603 388.8
+L469.603 388.8
+L434.114 388.8
+z
+" style="fill:#af00ff;stroke:#000000;"/>
+ </g>
+ <g id="patch_62">
+ <path clip-path="url(#p7ff5b81e1d)" d="
+M478.475 377.28
+L513.964 377.28
+L513.964 377.28
+L478.475 377.28
+z
+" style="fill:#af00ff;stroke:#000000;"/>
</g>
<g id="matplotlib.axis_1">
<g id="xtick_1">
@@ -261,16 +621,52 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/>
<g id="xtick_2">
<g id="line2d_3">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="161.28" xlink:href="#mcb557df647" y="388.8"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="127.8" xlink:href="#mcb557df647" y="388.8"/>
</g>
</g>
<g id="line2d_4">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="161.28" xlink:href="#mdad270ee8e" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="127.8" xlink:href="#mdad270ee8e" y="43.2"/>
</g>
</g>
<g id="text_2">
- <!-- 2 -->
+ <!-- 100 -->
+ <defs>
+ <path d="
+M12.4062 8.29688
+L28.5156 8.29688
+L28.5156 63.9219
+L10.9844 60.4062
+L10.9844 69.3906
+L28.4219 72.9062
+L38.2812 72.9062
+L38.2812 8.29688
+L54.3906 8.29688
+L54.3906 0
+L12.4062 0
+z
+" id="BitstreamVeraSans-Roman-31"/>
+ </defs>
+ <g transform="translate(117.405 401.70625)scale(0.12 -0.12)">
+ <use xlink:href="#BitstreamVeraSans-Roman-31"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ </g>
+ </g>
+ </g>
+ <g id="xtick_3">
+ <g id="line2d_5">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="183.6" xlink:href="#mcb557df647" y="388.8"/>
+ </g>
+ </g>
+ <g id="line2d_6">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="183.6" xlink:href="#mdad270ee8e" y="43.2"/>
+ </g>
+ </g>
+ <g id="text_3">
+ <!-- 200 -->
<defs>
<path d="
M19.1875 8.29688
@@ -296,24 +692,79 @@ Q49.8594 40.875 45.4062 35.4062
Q44.1875 33.9844 37.6406 27.2188
Q31.1094 20.4531 19.1875 8.29688" id="BitstreamVeraSans-Roman-32"/>
</defs>
- <g transform="translate(158.503125 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(172.985625 401.70625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
- <g id="xtick_3">
- <g id="line2d_5">
+ <g id="xtick_4">
+ <g id="line2d_7">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="250.56" xlink:href="#mcb557df647" y="388.8"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="239.4" xlink:href="#mcb557df647" y="388.8"/>
</g>
</g>
- <g id="line2d_6">
+ <g id="line2d_8">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="250.56" xlink:href="#mdad270ee8e" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="239.4" xlink:href="#mdad270ee8e" y="43.2"/>
</g>
</g>
- <g id="text_3">
- <!-- 4 -->
+ <g id="text_4">
+ <!-- 300 -->
+ <defs>
+ <path d="
+M40.5781 39.3125
+Q47.6562 37.7969 51.625 33
+Q55.6094 28.2188 55.6094 21.1875
+Q55.6094 10.4062 48.1875 4.48438
+Q40.7656 -1.42188 27.0938 -1.42188
+Q22.5156 -1.42188 17.6562 -0.515625
+Q12.7969 0.390625 7.625 2.20312
+L7.625 11.7188
+Q11.7188 9.32812 16.5938 8.10938
+Q21.4844 6.89062 26.8125 6.89062
+Q36.0781 6.89062 40.9375 10.5469
+Q45.7969 14.2031 45.7969 21.1875
+Q45.7969 27.6406 41.2812 31.2656
+Q36.7656 34.9062 28.7188 34.9062
+L20.2188 34.9062
+L20.2188 43.0156
+L29.1094 43.0156
+Q36.375 43.0156 40.2344 45.9219
+Q44.0938 48.8281 44.0938 54.2969
+Q44.0938 59.9062 40.1094 62.9062
+Q36.1406 65.9219 28.7188 65.9219
+Q24.6562 65.9219 20.0156 65.0312
+Q15.375 64.1562 9.8125 62.3125
+L9.8125 71.0938
+Q15.4375 72.6562 20.3438 73.4375
+Q25.25 74.2188 29.5938 74.2188
+Q40.8281 74.2188 47.3594 69.1094
+Q53.9062 64.0156 53.9062 55.3281
+Q53.9062 49.2656 50.4375 45.0938
+Q46.9688 40.9219 40.5781 39.3125" id="BitstreamVeraSans-Roman-33"/>
+ </defs>
+ <g transform="translate(228.8034375 401.70625)scale(0.12 -0.12)">
+ <use xlink:href="#BitstreamVeraSans-Roman-33"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ </g>
+ </g>
+ </g>
+ <g id="xtick_5">
+ <g id="line2d_9">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="295.2" xlink:href="#mcb557df647" y="388.8"/>
+ </g>
+ </g>
+ <g id="line2d_10">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="295.2" xlink:href="#mdad270ee8e" y="43.2"/>
+ </g>
+ </g>
+ <g id="text_5">
+ <!-- 400 -->
<defs>
<path d="
M37.7969 64.3125
@@ -335,24 +786,73 @@ L4.89062 26.7031
z
" id="BitstreamVeraSans-Roman-34"/>
</defs>
- <g transform="translate(247.3725 401.54875)scale(0.12 -0.12)">
+ <g transform="translate(284.439375 401.70625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-34"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
- <g id="xtick_4">
- <g id="line2d_7">
+ <g id="xtick_6">
+ <g id="line2d_11">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="339.84" xlink:href="#mcb557df647" y="388.8"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="351.0" xlink:href="#mcb557df647" y="388.8"/>
</g>
</g>
- <g id="line2d_8">
+ <g id="line2d_12">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="339.84" xlink:href="#mdad270ee8e" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="351.0" xlink:href="#mdad270ee8e" y="43.2"/>
</g>
</g>
- <g id="text_4">
- <!-- 6 -->
+ <g id="text_6">
+ <!-- 500 -->
+ <defs>
+ <path d="
+M10.7969 72.9062
+L49.5156 72.9062
+L49.5156 64.5938
+L19.8281 64.5938
+L19.8281 46.7344
+Q21.9688 47.4688 24.1094 47.8281
+Q26.2656 48.1875 28.4219 48.1875
+Q40.625 48.1875 47.75 41.5
+Q54.8906 34.8125 54.8906 23.3906
+Q54.8906 11.625 47.5625 5.09375
+Q40.2344 -1.42188 26.9062 -1.42188
+Q22.3125 -1.42188 17.5469 -0.640625
+Q12.7969 0.140625 7.71875 1.70312
+L7.71875 11.625
+Q12.1094 9.23438 16.7969 8.0625
+Q21.4844 6.89062 26.7031 6.89062
+Q35.1562 6.89062 40.0781 11.3281
+Q45.0156 15.7656 45.0156 23.3906
+Q45.0156 31 40.0781 35.4375
+Q35.1562 39.8906 26.7031 39.8906
+Q22.75 39.8906 18.8125 39.0156
+Q14.8906 38.1406 10.7969 36.2812
+z
+" id="BitstreamVeraSans-Roman-35"/>
+ </defs>
+ <g transform="translate(340.4090625 401.70625)scale(0.12 -0.12)">
+ <use xlink:href="#BitstreamVeraSans-Roman-35"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ </g>
+ </g>
+ </g>
+ <g id="xtick_7">
+ <g id="line2d_13">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="406.8" xlink:href="#mcb557df647" y="388.8"/>
+ </g>
+ </g>
+ <g id="line2d_14">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="406.8" xlink:href="#mdad270ee8e" y="43.2"/>
+ </g>
+ </g>
+ <g id="text_7">
+ <!-- 600 -->
<defs>
<path d="
M33.0156 40.375
@@ -383,24 +883,58 @@ Q23.3906 74.2188 37.2031 74.2188
Q40.9219 74.2188 44.7031 73.4844
Q48.4844 72.75 52.5938 71.2969" id="BitstreamVeraSans-Roman-36"/>
</defs>
- <g transform="translate(336.819375 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(396.165 401.70625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-36"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
- <g id="xtick_5">
- <g id="line2d_9">
+ <g id="xtick_8">
+ <g id="line2d_15">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="429.12" xlink:href="#mcb557df647" y="388.8"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="462.6" xlink:href="#mcb557df647" y="388.8"/>
</g>
</g>
- <g id="line2d_10">
+ <g id="line2d_16">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="429.12" xlink:href="#mdad270ee8e" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="462.6" xlink:href="#mdad270ee8e" y="43.2"/>
</g>
</g>
- <g id="text_5">
- <!-- 8 -->
+ <g id="text_8">
+ <!-- 700 -->
+ <defs>
+ <path d="
+M8.20312 72.9062
+L55.0781 72.9062
+L55.0781 68.7031
+L28.6094 0
+L18.3125 0
+L43.2188 64.5938
+L8.20312 64.5938
+z
+" id="BitstreamVeraSans-Roman-37"/>
+ </defs>
+ <g transform="translate(452.038125 401.70625)scale(0.12 -0.12)">
+ <use xlink:href="#BitstreamVeraSans-Roman-37"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ </g>
+ </g>
+ </g>
+ <g id="xtick_9">
+ <g id="line2d_17">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#mcb557df647" y="388.8"/>
+ </g>
+ </g>
+ <g id="line2d_18">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#mdad270ee8e" y="43.2"/>
+ </g>
+ </g>
+ <g id="text_9">
+ <!-- 800 -->
<defs>
<path d="
M31.7812 34.625
@@ -439,50 +973,17 @@ Q38.1406 66.4062 31.7812 66.4062
Q25.3906 66.4062 21.8438 63.2344
Q18.3125 60.0625 18.3125 54.3906" id="BitstreamVeraSans-Roman-38"/>
</defs>
- <g transform="translate(426.12 401.70625)scale(0.12 -0.12)">
+ <g transform="translate(507.7528125 401.70625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-38"/>
- </g>
- </g>
- </g>
- <g id="xtick_6">
- <g id="line2d_11">
- <g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#mcb557df647" y="388.8"/>
- </g>
- </g>
- <g id="line2d_12">
- <g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#mdad270ee8e" y="43.2"/>
- </g>
- </g>
- <g id="text_6">
- <!-- 10 -->
- <defs>
- <path d="
-M12.4062 8.29688
-L28.5156 8.29688
-L28.5156 63.9219
-L10.9844 60.4062
-L10.9844 69.3906
-L28.4219 72.9062
-L38.2812 72.9062
-L38.2812 8.29688
-L54.3906 8.29688
-L54.3906 0
-L12.4062 0
-z
-" id="BitstreamVeraSans-Roman-31"/>
- </defs>
- <g transform="translate(511.8225 401.70625)scale(0.12 -0.12)">
- <use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ <use x="127.24609375" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
</g>
<g id="matplotlib.axis_2">
<g id="ytick_1">
- <g id="line2d_13">
+ <g id="line2d_19">
<defs>
<path d="
M0 0
@@ -492,7 +993,7 @@ L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.
<use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="388.8"/>
</g>
</g>
- <g id="line2d_14">
+ <g id="line2d_20">
<defs>
<path d="
M0 0
@@ -502,155 +1003,562 @@ L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0
<use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="388.8"/>
</g>
</g>
- <g id="text_7">
+ <g id="text_10">
<!-- 0 -->
<g transform="translate(61.953125 393.1678125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
<g id="ytick_2">
- <g id="line2d_15">
+ <g id="line2d_21">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="319.68"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="331.2"/>
</g>
</g>
- <g id="line2d_16">
+ <g id="line2d_22">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="319.68"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="331.2"/>
</g>
</g>
- <g id="text_8">
+ <g id="text_11">
<!-- 5 -->
- <defs>
- <path d="
-M10.7969 72.9062
-L49.5156 72.9062
-L49.5156 64.5938
-L19.8281 64.5938
-L19.8281 46.7344
-Q21.9688 47.4688 24.1094 47.8281
-Q26.2656 48.1875 28.4219 48.1875
-Q40.625 48.1875 47.75 41.5
-Q54.8906 34.8125 54.8906 23.3906
-Q54.8906 11.625 47.5625 5.09375
-Q40.2344 -1.42188 26.9062 -1.42188
-Q22.3125 -1.42188 17.5469 -0.640625
-Q12.7969 0.140625 7.71875 1.70312
-L7.71875 11.625
-Q12.1094 9.23438 16.7969 8.0625
-Q21.4844 6.89062 26.7031 6.89062
-Q35.1562 6.89062 40.0781 11.3281
-Q45.0156 15.7656 45.0156 23.3906
-Q45.0156 31 40.0781 35.4375
-Q35.1562 39.8906 26.7031 39.8906
-Q22.75 39.8906 18.8125 39.0156
-Q14.8906 38.1406 10.7969 36.2812
-z
-" id="BitstreamVeraSans-Roman-35"/>
- </defs>
- <g transform="translate(62.339375 323.9690625)scale(0.12 -0.12)">
+ <g transform="translate(62.339375 335.4890625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-35"/>
</g>
</g>
</g>
<g id="ytick_3">
- <g id="line2d_17">
+ <g id="line2d_23">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="250.56"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="273.6"/>
</g>
</g>
- <g id="line2d_18">
+ <g id="line2d_24">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="250.56"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="273.6"/>
</g>
</g>
- <g id="text_9">
+ <g id="text_12">
<!-- 10 -->
- <g transform="translate(54.845 254.9278125)scale(0.12 -0.12)">
+ <g transform="translate(54.845 277.9678125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
<g id="ytick_4">
- <g id="line2d_19">
+ <g id="line2d_25">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="181.44"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="216.0"/>
</g>
</g>
- <g id="line2d_20">
+ <g id="line2d_26">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="181.44"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="216.0"/>
</g>
</g>
- <g id="text_10">
+ <g id="text_13">
<!-- 15 -->
- <g transform="translate(55.09625 185.7290625)scale(0.12 -0.12)">
+ <g transform="translate(55.09625 220.2890625)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-31"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-35"/>
</g>
</g>
</g>
<g id="ytick_5">
- <g id="line2d_21">
+ <g id="line2d_27">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="112.32"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="158.4"/>
</g>
</g>
- <g id="line2d_22">
+ <g id="line2d_28">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="112.32"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="158.4"/>
</g>
</g>
- <g id="text_11">
+ <g id="text_14">
<!-- 20 -->
- <g transform="translate(54.40625 116.6878125)scale(0.12 -0.12)">
+ <g transform="translate(54.40625 162.7678125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
</g>
</g>
</g>
<g id="ytick_6">
- <g id="line2d_23">
+ <g id="line2d_29">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="100.8"/>
</g>
</g>
- <g id="line2d_24">
+ <g id="line2d_30">
<g>
- <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="43.2"/>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="100.8"/>
</g>
</g>
- <g id="text_12">
+ <g id="text_15">
<!-- 25 -->
- <g transform="translate(54.6575 47.5678125)scale(0.12 -0.12)">
+ <g transform="translate(54.6575 105.1678125)scale(0.12 -0.12)">
<use xlink:href="#BitstreamVeraSans-Roman-32"/>
<use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-35"/>
</g>
</g>
</g>
+ <g id="ytick_7">
+ <g id="line2d_31">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="72.0" xlink:href="#mc8fcea1516" y="43.2"/>
+ </g>
+ </g>
+ <g id="line2d_32">
+ <g>
+ <use style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;" x="518.4" xlink:href="#m0d5b0a6425" y="43.2"/>
+ </g>
+ </g>
+ <g id="text_16">
+ <!-- 30 -->
+ <g transform="translate(54.441875 47.5678125)scale(0.12 -0.12)">
+ <use xlink:href="#BitstreamVeraSans-Roman-33"/>
+ <use x="63.623046875" xlink:href="#BitstreamVeraSans-Roman-30"/>
+ </g>
+ </g>
+ </g>
</g>
- <g id="patch_23">
+ <g id="patch_63">
<path d="
M72 43.2
L518.4 43.2" style="fill:none;stroke:#000000;"/>
</g>
- <g id="patch_24">
+ <g id="patch_64">
<path d="
M518.4 388.8
L518.4 43.2" style="fill:none;stroke:#000000;"/>
</g>
- <g id="patch_25">
+ <g id="patch_65">
<path d="
M72 388.8
L518.4 388.8" style="fill:none;stroke:#000000;"/>
</g>
- <g id="patch_26">
+ <g id="patch_66">
<path d="
M72 388.8
L72 43.2" style="fill:none;stroke:#000000;"/>
</g>
+ <g id="legend_1">
+ <g id="patch_67">
+ <path d="
+M397.641 157.612
+L511.2 157.612
+L511.2 50.4
+L397.641 50.4
+L397.641 157.612
+z
+" style="fill:#ffffff;stroke:#000000;"/>
+ </g>
+ <g id="patch_68">
+ <path d="
+M403.401 67.1017
+L432.201 67.1017
+L432.201 57.0217
+L403.401 57.0217
+z
+" style="fill:#93ff00;stroke:#000000;"/>
+ </g>
+ <g id="text_17">
+ <!-- green -->
+ <defs>
+ <path d="
+M56.2031 29.5938
+L56.2031 25.2031
+L14.8906 25.2031
+Q15.4844 15.9219 20.4844 11.0625
+Q25.4844 6.20312 34.4219 6.20312
+Q39.5938 6.20312 44.4531 7.46875
+Q49.3125 8.73438 54.1094 11.2812
+L54.1094 2.78125
+Q49.2656 0.734375 44.1875 -0.34375
+Q39.1094 -1.42188 33.8906 -1.42188
+Q20.7969 -1.42188 13.1562 6.1875
+Q5.51562 13.8125 5.51562 26.8125
+Q5.51562 40.2344 12.7656 48.1094
+Q20.0156 56 32.3281 56
+Q43.3594 56 49.7812 48.8906
+Q56.2031 41.7969 56.2031 29.5938
+M47.2188 32.2344
+Q47.125 39.5938 43.0938 43.9844
+Q39.0625 48.3906 32.4219 48.3906
+Q24.9062 48.3906 20.3906 44.1406
+Q15.875 39.8906 15.1875 32.1719
+z
+" id="BitstreamVeraSans-Roman-65"/>
+ <path d="
+M54.8906 33.0156
+L54.8906 0
+L45.9062 0
+L45.9062 32.7188
+Q45.9062 40.4844 42.875 44.3281
+Q39.8438 48.1875 33.7969 48.1875
+Q26.5156 48.1875 22.3125 43.5469
+Q18.1094 38.9219 18.1094 30.9062
+L18.1094 0
+L9.07812 0
+L9.07812 54.6875
+L18.1094 54.6875
+L18.1094 46.1875
+Q21.3438 51.125 25.7031 53.5625
+Q30.0781 56 35.7969 56
+Q45.2188 56 50.0469 50.1719
+Q54.8906 44.3438 54.8906 33.0156" id="BitstreamVeraSans-Roman-6e"/>
+ <path d="
+M45.4062 27.9844
+Q45.4062 37.75 41.375 43.1094
+Q37.3594 48.4844 30.0781 48.4844
+Q22.8594 48.4844 18.8281 43.1094
+Q14.7969 37.75 14.7969 27.9844
+Q14.7969 18.2656 18.8281 12.8906
+Q22.8594 7.51562 30.0781 7.51562
+Q37.3594 7.51562 41.375 12.8906
+Q45.4062 18.2656 45.4062 27.9844
+M54.3906 6.78125
+Q54.3906 -7.17188 48.1875 -13.9844
+Q42 -20.7969 29.2031 -20.7969
+Q24.4688 -20.7969 20.2656 -20.0938
+Q16.0625 -19.3906 12.1094 -17.9219
+L12.1094 -9.1875
+Q16.0625 -11.3281 19.9219 -12.3438
+Q23.7812 -13.375 27.7812 -13.375
+Q36.625 -13.375 41.0156 -8.76562
+Q45.4062 -4.15625 45.4062 5.17188
+L45.4062 9.625
+Q42.625 4.78125 38.2812 2.39062
+Q33.9375 0 27.875 0
+Q17.8281 0 11.6719 7.65625
+Q5.51562 15.3281 5.51562 27.9844
+Q5.51562 40.6719 11.6719 48.3281
+Q17.8281 56 27.875 56
+Q33.9375 56 38.2812 53.6094
+Q42.625 51.2188 45.4062 46.3906
+L45.4062 54.6875
+L54.3906 54.6875
+z
+" id="BitstreamVeraSans-Roman-67"/>
+ <path d="
+M41.1094 46.2969
+Q39.5938 47.1719 37.8125 47.5781
+Q36.0312 48 33.8906 48
+Q26.2656 48 22.1875 43.0469
+Q18.1094 38.0938 18.1094 28.8125
+L18.1094 0
+L9.07812 0
+L9.07812 54.6875
+L18.1094 54.6875
+L18.1094 46.1875
+Q20.9531 51.1719 25.4844 53.5781
+Q30.0312 56 36.5312 56
+Q37.4531 56 38.5781 55.875
+Q39.7031 55.7656 41.0625 55.5156
+z
+" id="BitstreamVeraSans-Roman-72"/>
+ </defs>
+ <g transform="translate(443.72125 67.10175)scale(0.144 -0.144)">
+ <use xlink:href="#BitstreamVeraSans-Roman-67"/>
+ <use x="63.4765625" xlink:href="#BitstreamVeraSans-Roman-72"/>
+ <use x="102.33984375" xlink:href="#BitstreamVeraSans-Roman-65"/>
+ <use x="163.86328125" xlink:href="#BitstreamVeraSans-Roman-65"/>
+ <use x="225.38671875" xlink:href="#BitstreamVeraSans-Roman-6e"/>
+ </g>
+ </g>
+ <g id="patch_69">
+ <path d="
+M403.401 88.2382
+L432.201 88.2382
+L432.201 78.1582
+L403.401 78.1582
+z
+" style="fill:#00ff59;stroke:#000000;"/>
+ </g>
+ <g id="text_18">
+ <!-- orange -->
+ <defs>
+ <path d="
+M30.6094 48.3906
+Q23.3906 48.3906 19.1875 42.75
+Q14.9844 37.1094 14.9844 27.2969
+Q14.9844 17.4844 19.1562 11.8438
+Q23.3438 6.20312 30.6094 6.20312
+Q37.7969 6.20312 41.9844 11.8594
+Q46.1875 17.5312 46.1875 27.2969
+Q46.1875 37.0156 41.9844 42.7031
+Q37.7969 48.3906 30.6094 48.3906
+M30.6094 56
+Q42.3281 56 49.0156 48.375
+Q55.7188 40.7656 55.7188 27.2969
+Q55.7188 13.875 49.0156 6.21875
+Q42.3281 -1.42188 30.6094 -1.42188
+Q18.8438 -1.42188 12.1719 6.21875
+Q5.51562 13.875 5.51562 27.2969
+Q5.51562 40.7656 12.1719 48.375
+Q18.8438 56 30.6094 56" id="BitstreamVeraSans-Roman-6f"/>
+ <path d="
+M34.2812 27.4844
+Q23.3906 27.4844 19.1875 25
+Q14.9844 22.5156 14.9844 16.5
+Q14.9844 11.7188 18.1406 8.90625
+Q21.2969 6.10938 26.7031 6.10938
+Q34.1875 6.10938 38.7031 11.4062
+Q43.2188 16.7031 43.2188 25.4844
+L43.2188 27.4844
+z
+
+M52.2031 31.2031
+L52.2031 0
+L43.2188 0
+L43.2188 8.29688
+Q40.1406 3.32812 35.5469 0.953125
+Q30.9531 -1.42188 24.3125 -1.42188
+Q15.9219 -1.42188 10.9531 3.29688
+Q6 8.01562 6 15.9219
+Q6 25.1406 12.1719 29.8281
+Q18.3594 34.5156 30.6094 34.5156
+L43.2188 34.5156
+L43.2188 35.4062
+Q43.2188 41.6094 39.1406 45
+Q35.0625 48.3906 27.6875 48.3906
+Q23 48.3906 18.5469 47.2656
+Q14.1094 46.1406 10.0156 43.8906
+L10.0156 52.2031
+Q14.9375 54.1094 19.5781 55.0469
+Q24.2188 56 28.6094 56
+Q40.4844 56 46.3438 49.8438
+Q52.2031 43.7031 52.2031 31.2031" id="BitstreamVeraSans-Roman-61"/>
+ </defs>
+ <g transform="translate(443.72125 88.23825)scale(0.144 -0.144)">
+ <use xlink:href="#BitstreamVeraSans-Roman-6f"/>
+ <use x="61.181640625" xlink:href="#BitstreamVeraSans-Roman-72"/>
+ <use x="102.294921875" xlink:href="#BitstreamVeraSans-Roman-61"/>
+ <use x="163.57421875" xlink:href="#BitstreamVeraSans-Roman-6e"/>
+ <use x="226.953125" xlink:href="#BitstreamVeraSans-Roman-67"/>
+ <use x="290.4296875" xlink:href="#BitstreamVeraSans-Roman-65"/>
+ </g>
+ </g>
+ <g id="patch_70">
+ <path d="
+M403.401 109.375
+L432.201 109.375
+L432.201 99.2947
+L403.401 99.2947
+z
+" style="fill:#00ffa7;stroke:#000000;"/>
+ </g>
+ <g id="text_19">
+ <!-- yellow -->
+ <defs>
+ <path id="BitstreamVeraSans-Roman-20"/>
+ <path d="
+M4.20312 54.6875
+L13.1875 54.6875
+L24.4219 12.0156
+L35.5938 54.6875
+L46.1875 54.6875
+L57.4219 12.0156
+L68.6094 54.6875
+L77.5938 54.6875
+L63.2812 0
+L52.6875 0
+L40.9219 44.8281
+L29.1094 0
+L18.5 0
+z
+" id="BitstreamVeraSans-Roman-77"/>
+ <path d="
+M9.42188 75.9844
+L18.4062 75.9844
+L18.4062 0
+L9.42188 0
+z
+" id="BitstreamVeraSans-Roman-6c"/>
+ <path d="
+M32.1719 -5.07812
+Q28.375 -14.8438 24.75 -17.8125
+Q21.1406 -20.7969 15.0938 -20.7969
+L7.90625 -20.7969
+L7.90625 -13.2812
+L13.1875 -13.2812
+Q16.8906 -13.2812 18.9375 -11.5156
+Q21 -9.76562 23.4844 -3.21875
+L25.0938 0.875
+L2.98438 54.6875
+L12.5 54.6875
+L29.5938 11.9219
+L46.6875 54.6875
+L56.2031 54.6875
+z
+" id="BitstreamVeraSans-Roman-79"/>
+ </defs>
+ <g transform="translate(443.72125 109.37475)scale(0.144 -0.144)">
+ <use xlink:href="#BitstreamVeraSans-Roman-20"/>
+ <use x="31.787109375" xlink:href="#BitstreamVeraSans-Roman-79"/>
+ <use x="90.966796875" xlink:href="#BitstreamVeraSans-Roman-65"/>
+ <use x="152.490234375" xlink:href="#BitstreamVeraSans-Roman-6c"/>
+ <use x="180.2734375" xlink:href="#BitstreamVeraSans-Roman-6c"/>
+ <use x="208.056640625" xlink:href="#BitstreamVeraSans-Roman-6f"/>
+ <use x="269.23828125" xlink:href="#BitstreamVeraSans-Roman-77"/>
+ </g>
+ </g>
+ <g id="patch_71">
+ <path d="
+M403.401 130.511
+L432.201 130.511
+L432.201 120.431
+L403.401 120.431
+z
+" style="fill:#00a8ff;stroke:#000000;"/>
+ </g>
+ <g id="text_20">
+ <!-- magenta -->
+ <defs>
+ <path d="
+M52 44.1875
+Q55.375 50.25 60.0625 53.125
+Q64.75 56 71.0938 56
+Q79.6406 56 84.2812 50.0156
+Q88.9219 44.0469 88.9219 33.0156
+L88.9219 0
+L79.8906 0
+L79.8906 32.7188
+Q79.8906 40.5781 77.0938 44.375
+Q74.3125 48.1875 68.6094 48.1875
+Q61.625 48.1875 57.5625 43.5469
+Q53.5156 38.9219 53.5156 30.9062
+L53.5156 0
+L44.4844 0
+L44.4844 32.7188
+Q44.4844 40.625 41.7031 44.4062
+Q38.9219 48.1875 33.1094 48.1875
+Q26.2188 48.1875 22.1562 43.5312
+Q18.1094 38.875 18.1094 30.9062
+L18.1094 0
+L9.07812 0
+L9.07812 54.6875
+L18.1094 54.6875
+L18.1094 46.1875
+Q21.1875 51.2188 25.4844 53.6094
+Q29.7812 56 35.6875 56
+Q41.6562 56 45.8281 52.9688
+Q50 49.9531 52 44.1875" id="BitstreamVeraSans-Roman-6d"/>
+ <path d="
+M18.3125 70.2188
+L18.3125 54.6875
+L36.8125 54.6875
+L36.8125 47.7031
+L18.3125 47.7031
+L18.3125 18.0156
+Q18.3125 11.3281 20.1406 9.42188
+Q21.9688 7.51562 27.5938 7.51562
+L36.8125 7.51562
+L36.8125 0
+L27.5938 0
+Q17.1875 0 13.2344 3.875
+Q9.28125 7.76562 9.28125 18.0156
+L9.28125 47.7031
+L2.6875 47.7031
+L2.6875 54.6875
+L9.28125 54.6875
+L9.28125 70.2188
+z
+" id="BitstreamVeraSans-Roman-74"/>
+ </defs>
+ <g transform="translate(443.72125 130.51125)scale(0.144 -0.144)">
+ <use xlink:href="#BitstreamVeraSans-Roman-6d"/>
+ <use x="97.412109375" xlink:href="#BitstreamVeraSans-Roman-61"/>
+ <use x="158.69140625" xlink:href="#BitstreamVeraSans-Roman-67"/>
+ <use x="222.16796875" xlink:href="#BitstreamVeraSans-Roman-65"/>
+ <use x="283.69140625" xlink:href="#BitstreamVeraSans-Roman-6e"/>
+ <use x="347.0703125" xlink:href="#BitstreamVeraSans-Roman-74"/>
+ <use x="386.279296875" xlink:href="#BitstreamVeraSans-Roman-61"/>
+ </g>
+ </g>
+ <g id="patch_72">
+ <path d="
+M403.401 151.648
+L432.201 151.648
+L432.201 141.568
+L403.401 141.568
+z
+" style="fill:#4800ff;stroke:#000000;"/>
+ </g>
+ <g id="text_21">
+ <!-- black -->
+ <defs>
+ <path d="
+M9.07812 75.9844
+L18.1094 75.9844
+L18.1094 31.1094
+L44.9219 54.6875
+L56.3906 54.6875
+L27.3906 29.1094
+L57.625 0
+L45.9062 0
+L18.1094 26.7031
+L18.1094 0
+L9.07812 0
+z
+" id="BitstreamVeraSans-Roman-6b"/>
+ <path d="
+M48.7812 52.5938
+L48.7812 44.1875
+Q44.9688 46.2969 41.1406 47.3438
+Q37.3125 48.3906 33.4062 48.3906
+Q24.6562 48.3906 19.8125 42.8438
+Q14.9844 37.3125 14.9844 27.2969
+Q14.9844 17.2812 19.8125 11.7344
+Q24.6562 6.20312 33.4062 6.20312
+Q37.3125 6.20312 41.1406 7.25
+Q44.9688 8.29688 48.7812 10.4062
+L48.7812 2.09375
+Q45.0156 0.34375 40.9844 -0.53125
+Q36.9688 -1.42188 32.4219 -1.42188
+Q20.0625 -1.42188 12.7812 6.34375
+Q5.51562 14.1094 5.51562 27.2969
+Q5.51562 40.6719 12.8594 48.3281
+Q20.2188 56 33.0156 56
+Q37.1562 56 41.1094 55.1406
+Q45.0625 54.2969 48.7812 52.5938" id="BitstreamVeraSans-Roman-63"/>
+ <path d="
+M48.6875 27.2969
+Q48.6875 37.2031 44.6094 42.8438
+Q40.5312 48.4844 33.4062 48.4844
+Q26.2656 48.4844 22.1875 42.8438
+Q18.1094 37.2031 18.1094 27.2969
+Q18.1094 17.3906 22.1875 11.75
+Q26.2656 6.10938 33.4062 6.10938
+Q40.5312 6.10938 44.6094 11.75
+Q48.6875 17.3906 48.6875 27.2969
+M18.1094 46.3906
+Q20.9531 51.2656 25.2656 53.625
+Q29.5938 56 35.5938 56
+Q45.5625 56 51.7812 48.0938
+Q58.0156 40.1875 58.0156 27.2969
+Q58.0156 14.4062 51.7812 6.48438
+Q45.5625 -1.42188 35.5938 -1.42188
+Q29.5938 -1.42188 25.2656 0.953125
+Q20.9531 3.32812 18.1094 8.20312
+L18.1094 0
+L9.07812 0
+L9.07812 75.9844
+L18.1094 75.9844
+z
+" id="BitstreamVeraSans-Roman-62"/>
+ </defs>
+ <g transform="translate(443.72125 151.64775)scale(0.144 -0.144)">
+ <use xlink:href="#BitstreamVeraSans-Roman-62"/>
+ <use x="63.4765625" xlink:href="#BitstreamVeraSans-Roman-6c"/>
+ <use x="91.259765625" xlink:href="#BitstreamVeraSans-Roman-61"/>
+ <use x="152.5390625" xlink:href="#BitstreamVeraSans-Roman-63"/>
+ <use x="207.51953125" xlink:href="#BitstreamVeraSans-Roman-6b"/>
+ </g>
+ </g>
+ </g>
</g>
</g>
<defs>
View
18 lib/matplotlib/tests/test_axes.py
@@ -989,11 +989,23 @@ def test_hist_stacked_step():
@image_comparison(baseline_images=['hist_stacked_bar'])
def test_hist_stacked_bar():
# make some data
- d1 = np.linspace(1, 3, 20)
- d2 = np.linspace(0, 10, 50)
+ d = [[100, 100, 100, 100, 200, 320, 450, 80, 20, 600, 310, 800], [20, 23, 50, 11, 100, 420], [120, 120, 120, 140, 140, 150, 180], [60, 60, 60, 60, 300, 300, 5, 5, 5, 5, 10, 300], [555, 555, 555, 30, 30, 30, 30, 30, 100, 100, 100, 100, 30, 30], [30, 30, 30, 30, 400, 400, 400, 400, 400, 400, 400, 400]]
+ colors = [(0.5759849696758961, 1.0, 0.0), (0.0, 1.0, 0.350624650815206), (0.0, 1.0, 0.6549834156005998), (0.0, 0.6569064625276622, 1.0), (0.28302699607823545, 0.0, 1.0), (0.6849123462299822, 0.0, 1.0)]
+ labels = ['green', 'orange', ' yellow', 'magenta', 'black']
+ fig = plt.figure()
+ ax = fig.add_subplot(111)
+ ax.hist(d, bins=10, histtype='barstacked', align='mid', color=colors, label=labels)
+ ax.legend(loc='upper right', bbox_to_anchor = (1.0, 1.0), ncol=1)
+
+@image_comparison(baseline_images=['hist_offset'])
+def test_hist_offset():
+ # make some data
+ d1 = np.linspace(0, 10, 50)
+ d2 = np.linspace(1, 3, 20)
fig = plt.figure()
ax = fig.add_subplot(111)
- ax.hist( (d1, d2), histtype="barstacked", stacked=True)
+ ax.hist(d1, bottom=5)
+ ax.hist(d2, bottom=15)
@image_comparison(baseline_images=['transparent_markers'], remove_text=True)
def test_transparent_markers():

0 comments on commit f6dfcea

Please sign in to comment.