From d4dd96139a8f95545163bae215ab96d9a46040b1 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 13:09:53 -0700 Subject: [PATCH 1/8] groundwork for computing median and CIs in the boxplot function with a user-specd function --- lib/matplotlib/axes.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py index ff7187b79740..8a1fec7d3c15 100644 --- a/lib/matplotlib/axes.py +++ b/lib/matplotlib/axes.py @@ -5615,7 +5615,8 @@ def xywhere(xs, ys, mask): def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, positions=None, widths=None, patch_artist=False, - bootstrap=None, usermedians=None, conf_intervals=None): + bootstrap=None, usermedians=None, conf_intervals=None, + cifxn=None): """ Make a box and whisker plot. @@ -5768,7 +5769,7 @@ def computeConfInterval(data, med, iq, bootstrap): # sanitize user-input medians msg1 = "usermedians must either be a list/tuple or a 1d array" msg2 = "usermedians' length must be compatible with x" - if usermedians is not None: + if usermedians is not None and cifxn is None: if hasattr(usermedians, 'shape'): if len(usermedians.shape) != 1: raise ValueError(msg1) @@ -5781,7 +5782,7 @@ def computeConfInterval(data, med, iq, bootstrap): msg1 = "conf_intervals must either be a list of tuples or a 2d array" msg2 = "conf_intervals' length must be compatible with x" msg3 = "each conf_interval, if specificied, must have two values" - if conf_intervals is not None: + if conf_intervals is not None and cifxn is None: if hasattr(conf_intervals, 'shape'): if len(conf_intervals.shape) != 2: raise ValueError(msg1) @@ -5818,9 +5819,11 @@ def computeConfInterval(data, med, iq, bootstrap): q1, med, q3 = mlab.prctile(d,[25,50,75]) # replace with input medians if available - if usermedians is not None: + if usermedians is not None and cifxn is None: if usermedians[i] is not None: med = usermedians[i] + elif cifxn is not None: + med, CIs = cifxn(d) # get high extreme iq = q3 - q1 @@ -5867,6 +5870,9 @@ def computeConfInterval(data, med, iq, bootstrap): if conf_intervals is not None and conf_intervals[i] is not None: notch_max = np.max(conf_intervals[i]) notch_min = np.min(conf_intervals[i]) + elif cifxn is not None: + notch_min = np.min(CIs) + notch_max = np.max(CIs) else: notch_min, notch_max = computeConfInterval(d, med, iq, bootstrap) From 8f5f5a67193e6a739ba8e2aac6411f6390d24da1 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 17:28:31 -0700 Subject: [PATCH 2/8] modified boxplot_demo3 to include the new kwarg --- examples/pylab_examples/boxplot_demo3.py | 49 ++++++++++++------------ lib/matplotlib/axes.py | 26 ++++++++----- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/examples/pylab_examples/boxplot_demo3.py b/examples/pylab_examples/boxplot_demo3.py index fe7e5b77a3d5..e808dbcd0695 100644 --- a/examples/pylab_examples/boxplot_demo3.py +++ b/examples/pylab_examples/boxplot_demo3.py @@ -2,7 +2,7 @@ import matplotlib.transforms as mtransforms import numpy as np -def fakeBootStrapper(n): +def fakeBootStrapper(data): ''' This is just a placeholder for the user's method of bootstrapping the median and its confidence intervals. @@ -10,16 +10,10 @@ def fakeBootStrapper(n): Returns an arbitrary median and confidence intervals packed into a tuple ''' - if n == 1: - med = 0.1 - CI = (-0.25, 0.25) - else: - med = 0.2 - CI = (-0.35, 0.50) - - return med, CI - - + med, q25, q75 = np.percentile(data, [50,25,75]) + ci_lo = med - (med-q25)/2.0 + ci_hi = med + (q75-med)/3.0 + return med, (ci_lo, ci_hi) np.random.seed(2) inc = 0.1 @@ -29,21 +23,28 @@ def fakeBootStrapper(n): e4 = np.random.normal(0, 1 + 2*inc, size=(500,)) treatments = [e1,e2,e3,e4] -med1, CI1 = fakeBootStrapper(1) -med2, CI2 = fakeBootStrapper(2) +med1, CI1 = fakeBootStrapper(e3) +med2, CI2 = fakeBootStrapper(e4) medians = [None, None, med1, med2] conf_intervals = [None, None, CI1, CI2] -fig = plt.figure() -ax = fig.add_subplot(111) +fig, (ax1, ax2) = plt.subplots(nrows=2) pos = np.array(range(len(treatments)))+1 -bp = ax.boxplot(treatments, sym='k+', positions=pos, - notch=1, bootstrap=5000, - usermedians=medians, - conf_intervals=conf_intervals) - -ax.set_xlabel('treatment') -ax.set_ylabel('response') -plt.setp(bp['whiskers'], color='k', linestyle='-' ) -plt.setp(bp['fliers'], markersize=3.0) + +# specify the medians and CIs manually +bp1 = ax1.boxplot(treatments, sym='k+', positions=pos, + notch=1, bootstrap=5000, + usermedians=medians, + conf_intervals=conf_intervals) + +# let the function `fakeBootStrapper` compute the med. and CIs +bp2 = ax2.boxplot(treatments, sym='k+', positions=pos, + notch=1, bootstrap=5000, + ci_func=fakeBootStrapper) + +for ax, bp in zip([ax1, ax2], [bp1, bp2]): + ax.set_xlabel('treatment') + ax.set_ylabel('response') + plt.setp(bp['whiskers'], color='k', linestyle='-' ) + plt.setp(bp['fliers'], markersize=3.0) plt.show() diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py index 8a1fec7d3c15..d57780002a76 100644 --- a/lib/matplotlib/axes.py +++ b/lib/matplotlib/axes.py @@ -5616,7 +5616,7 @@ def xywhere(xs, ys, mask): def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, positions=None, widths=None, patch_artist=False, bootstrap=None, usermedians=None, conf_intervals=None, - cifxn=None): + ci_func=None): """ Make a box and whisker plot. @@ -5664,6 +5664,14 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, bootstrap the median to determine it's 95% confidence intervals. Values between 1000 and 10000 are recommended. + *ci_func* : [ function ] + A user-specified function that Computes the median and its + confidence intervals. This function should return the median and + the confidence intervals stored in an iterable of shape=(2,). Use + of this kwarg will override the default computation of the median + and will supercede any values supplied in the *usermedians* or + *conf_intervals* kwargs. + *usermedians* : [ default None ] An array or sequence whose first dimension (or length) is compatible with *x*. This overrides the medians computed by @@ -5675,8 +5683,8 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, Array or sequence whose first dimension (or length) is compatible with *x* and whose second dimension is 2. When the current element of *conf_intervals* is not None, the notch locations computed by - matplotlib are overridden (assuming notch is True). When an element of - *conf_intervals* is None, boxplot compute notches the method + matplotlib are overridden (assuming notch is True). When an element + of *conf_intervals* is None, boxplot compute notches the method specified by the other kwargs (e.g. *bootstrap*). *positions* : [ default 1,2,...,n ] @@ -5769,7 +5777,7 @@ def computeConfInterval(data, med, iq, bootstrap): # sanitize user-input medians msg1 = "usermedians must either be a list/tuple or a 1d array" msg2 = "usermedians' length must be compatible with x" - if usermedians is not None and cifxn is None: + if usermedians is not None and ci_func is None: if hasattr(usermedians, 'shape'): if len(usermedians.shape) != 1: raise ValueError(msg1) @@ -5782,7 +5790,7 @@ def computeConfInterval(data, med, iq, bootstrap): msg1 = "conf_intervals must either be a list of tuples or a 2d array" msg2 = "conf_intervals' length must be compatible with x" msg3 = "each conf_interval, if specificied, must have two values" - if conf_intervals is not None and cifxn is None: + if conf_intervals is not None and ci_func is None: if hasattr(conf_intervals, 'shape'): if len(conf_intervals.shape) != 2: raise ValueError(msg1) @@ -5819,11 +5827,11 @@ def computeConfInterval(data, med, iq, bootstrap): q1, med, q3 = mlab.prctile(d,[25,50,75]) # replace with input medians if available - if usermedians is not None and cifxn is None: + if usermedians is not None and ci_func is None: if usermedians[i] is not None: med = usermedians[i] - elif cifxn is not None: - med, CIs = cifxn(d) + elif ci_func is not None: + med, CIs = ci_func(d) # get high extreme iq = q3 - q1 @@ -5870,7 +5878,7 @@ def computeConfInterval(data, med, iq, bootstrap): if conf_intervals is not None and conf_intervals[i] is not None: notch_max = np.max(conf_intervals[i]) notch_min = np.min(conf_intervals[i]) - elif cifxn is not None: + elif ci_func is not None: notch_min = np.min(CIs) notch_max = np.max(CIs) else: From f7555a0c38ab9ba058623c989de50e3678fa9ba0 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 17:40:04 -0700 Subject: [PATCH 3/8] fixed example line in docstring --- lib/matplotlib/axes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py index d57780002a76..2b92fa7f2676 100644 --- a/lib/matplotlib/axes.py +++ b/lib/matplotlib/axes.py @@ -5716,7 +5716,7 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, **Example:** - .. plot:: pyplots/boxplot_demo.py + .. plot:: mpl_examples/pylab_examples/boxplot_demo3.py """ def bootstrapMedian(data, N=5000): # determine 95% confidence intervals of the median From f9cd5715568f330aab2824e9a0f25f82aad9fdeb Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 18:07:28 -0700 Subject: [PATCH 4/8] added test and baseline images --- .../baseline_images/test_axes/boxplot.pdf | Bin 5167 -> 5876 bytes .../baseline_images/test_axes/boxplot.png | Bin 7924 -> 10113 bytes .../baseline_images/test_axes/boxplot.svg | 491 ++++++++++++++---- lib/matplotlib/tests/test_axes.py | 23 +- 4 files changed, 419 insertions(+), 95 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf index e5fac1ea88731b13292e1d843bc1d582fa5d4387..eea7d6c0c1bcff0f654bb4a3c1f280515c649ddf 100644 GIT binary patch delta 1928 zcmZXScTm&W7RSX6ya+sm&_qxX31tOIFH%LCAVrFZG^Isw2}S9KA0SFFQWJWKk~Odp z9}J0EaOqh=!WznZf)oJ(0j0Ny8ew(+dINXPopa_hcfQ|q?wnekP5rt$F`)U1VU`+J zdU?*h>Y`*1WQ&-gDKR#T*R;&;ATMcljov|?<*j1{Q9ZLo9PV~9fXY-Z0xvEbf6XIVsmZM<3su?MqRi#N(0tU)NK9 zmemoc0;C~E+_y5T=2yGaYqY~6w?3zxk25@@z+m#*+1F&MezS2>>mY7K>G5{vtbxAk z*cPpo17>f#3c&Acy+xa%ygH>FTUjX}aQ&so%?ik99cT*W=XPG~_LfuqXg9lTTv;=m zIW%lus;V5F5Wy?o)hq%D-cbCwgrhpK{hp@H}(;f+5F&$zw);}V*1Y1aIWO7=~kZ@VuuMyyKVM{IBaT+G9@7O&}0_ zQ7(&m*=Orf^1jqygWDhuP3H*QfBiF!L9V)SkZby$J&oB9EapT z)vOj|S$8MTHyc97XGyk$&L!s``f)(x$F4p<@QSH)%H4QO>w|oDQAm5-qkC|ZR~=gs zo?9oFue*;O)G$TIl@8-|51Ii($=OMxY+3&w*^A)@JGd$xvwl4}WIBm#H*u}_2`K%_ z_x;xy9vSVD$l@L&f96^#3{DG$KZ^xDOX@PrIj=wY-ztUGLW@=6AO8IZNg9bsQT_?l zIyzRt=kCV+yFY^@BQNpRy23DF*+pm=I;WSYQQys$ukRkHtxWMc1~>#zYj{8DJJstd z$!L^#ne^6B`JdB&sV>d7Pqyr4&bt)rM4Ds7Wlol8FxfQqei!d%jR3Y#7*g+15_WSF z6+o?CGROQjawdR^jnyhKI!pT{H_8@sNE})cK+m-gv1PrS^)gV`wvU^v$2OjXF>Nxg z>zD1eI3z)ghQtVf>H!s-;|l7HQfA4tc~fbd)4Oh^)_GSWi<}8+XVRF^|Dl_|M^ojZ zOS$Li=!A*7!rzl?TGk$vKdhLAxY@V78Yw8{5{D#-FMLA8kKADPS1rZL)%)! zTk>nsOFGr1qnFq_FA%;{gNGlfy=?x>Wo;@mFF(2c^jq4;gvZa$^rb0Ns?{dKc7KvV zGVCM+iPTBZ5fB`WK(fDr8l=H^I1-LUc#(`9f85^>lJ}R@0;_-KkgMoBVZWnq`ZX`8i~eALZOz9R+4`MvP@&$ delta 1189 zcmeyOyIy0%2FCie;lBB|4S4px4u7#jc2(Dv?^|z#C2TJ{SSC@Xajh(RVu?rF!ut9t zE+@+#m3RjKNa$Mf(_@zZCPzDtDe|f(Y6ia#{B5h-==J}+a0-l&z(Cb^*>EyD5_WT|Frr`N$ujV zYtNi)*t1VWfVa}A=+w>o&1l?Rh1&BJ}0nF5|T>Yo~6!{VVnIVn46h9S3J{v;{<4 z8k9MOoOE`0uh=%R?$+g{Ydkw_f7Rc$SUa6{jis-VQ0)HLgNc6|FD-oiaBHLdUSkUl zzj^C!J?H)CxzqFZVm0^2r870of10%X^o|SaXMfze*M0dQQ`wpZ*;C8=MD8qfsJ2Wt z{aRB#BjT^so;3%{Do(yy{4z!8ZGduIQ~_7qA#c7bl_wkHPIyn=a>;nlmJE-Lr@gN! zXVizT2)@Xww4!tFEw<>_oKGdnqxIc>eX7Zh?!Nzqx8Cl5@=bGB$vD2n^Nu;L=JoY? zx?t&DWh3_2DxrLvYOL6`BOWFk)sk8Bkehw=4a17ipeS5Lw;+J(#>mP;fY204)QQ^M6OMBWbLmho7 zo$~g?+pi)cRyIA0nK*5|xO1r-9R5~Ci z+_#3wZ~dZq4-S5Qc~@)2t6BA%&+x5VzWBbR!Y+k|Pi)E4ii@hs%3eCVm>yB;Gq`zV z#a*lJ*BySM+_j7RCo+mZYwT@2HcN}|z}b*S_Sbd^hkr8*ZFE1dgMEha_r?oliv$g3 zOYDgL&KMo6F}s!VT1mt&Pf2FKI-?gpH*P5}JN8q4YG>jPU&XCI*v*rcZkfE0U7Fd# z&~)y<$6-mf2F)=n*FaQCCJOwT=!@$JYzz9>!*aTC| z)D%<9+zeC9(tL8SsBgWInK8PYu_2~N}A`~_DB}zk*L8ls-_Q5+`J89)SshL8 zjY1nC2;x4arFIU2Si~TR`634!7*RCS0N~oGta58 z8&iTl)-a=zCxcsbo$TlkmGgX?QaEX_!UQ2BN0_#MNQ52^dwliqrMxlIGBP&q&LJ#+ z22*{;W^+B-1a88o4(oMttDZUlL3ToJ)xqC3FhPk8o8ES%^i5?DiA3)14xWmx;5SzY zwGEL{Us{q*-uPU3TQ79p%*w-w_W8$1%l+v7J6KDdpyT5`q6sE%=PeV1tg-GLD4bq#p`O1>519p%cH#l?8-Ss zMS^a$R&W zRC|TIMY>&w)@wI#Ud$a;<}&`Q_BUPp5Oi$_?!n4-{7bdHAq3^bLWl1BQ6?0KokPr| zER@p+?tlzDJmkOWHRAfL=dtBLbv-_T=n*nm%3E&VC5!=a4;1qu1H^cGCyBN!5b{B2mbfC}5r#0o)L8W7XEVY@^WZgeB0aT>=qx62>N zQhb)BO=Io&SE{e1!y&;6l-HN3JG@fj;XBJ_T{HB{q0tlIyglHWS#xy6&M+n4(h^T- z{!cJy%du@;%^+E}3vg=-lZ8IsgP6I$p7`tdKUWm)F-VT3K|demULJrZ7Uska9~+j% z9@=&WIjZYz>RE7EOC%1lll6Hr?d|Ofj+1jPvsLQx!_Vf)jx3PBq`ZP1M_`pEVXz8J zT`L*IUB?V1w)SvKr3$cuw|SAZHn_g6AiMUvBIoT|yd%mknwW%kc6M@igZa(Bgn76_ z6!LF!DC}-^Dpb5?Y-IF0?di8i43HqIf7ExLUK$-8O(h2!;JVtxVZj!%_(;B z(f?pM(NDcvs@v7HJ6W809<7jL9GTA=$bUPV^(-+XY;t|hdLbS(`S0mdb#G|63 ztSl{e9eb|xjzEaOm_ZP#Zneu!FaSgXKzryzVix!g3AcJ{n*wPF`lJPQ29i?=vy4*o zZJ~k$wA+|rL9SX((l?4Sr4}O?=mef&=_mvp4g-%CXiz9rQx3p{yuS1{y$yJ(>^5N{ zBP$!Rs^aSEdQe_oetrhB>#!){6g%tM)YO!llOs1j<31|=AOyvo`V3+|qNu1S@LWf# z!2>$ilJ)i`FEVlH^5x6kf$ZA+WFc+E$QGuxqPB}6_`peB4owKA)Y||D)S=r!#n+Qc zwakmo-r57DB$)%V4i`!e~YP)XVrYit66u*02QX*O3TO*p2r` zV6tAF?%~`YJIWR`RHl&la#+7lD9+T_G|YWSzQ93lKQo7RT1Tm*I6-3POblfQy~%th z;YI}|44r&EiA}+)?U{IU+`fMETf~tFL^z6k+I&A<<)#*nEk)eF^3EtqVxm-@G~b<( zWur9dX^4N;Z*q&ja(BsOIa-uX$#Yxi@I64{&rT~zCi~2$z_LB{J2O^-buXB5YxB4w zA^+W*MZ*^}DnjfE#GP=M@o%f`h3Q%LZ=8LkNyKcpgLh|B<5M1y^pgECJ3&o6cz2rx zCQ7xyv#Xw^Ed?S3Da338Q{o=;r9bg+5=1CTJf`V4=(O~VfN$dd5Om7c2rq5Eof7T0 zoidlL`Hm1>{U&|>n{IRgb*v()plteyz9DPdDFCbcDVbN)Zyp=mcpfo(66WmZb(DUf zz)6wh=zM>1Ks3B)q6Gc&WuAhC3hM*bX_W|-g$y=--w2;;_=ZSW#q8<9v6r%8?u!FA zhy4}@T&$?FbeE;&Hbj_`yIk*5QgCL#k;@+Ono+g_{hDfg>Uy@PAUVCPB5{(UuLNm% ztm#Q^{A$@SDY7DWhptDXJ7J~R3U1~yrmZr27B5P(#7EFZ+zITDSsxr6o%7Dj%5v(G zypzM5uzUf}t*GWrUx>C&l`<+6rgZq3wr|Q2mi4`XM^I1Vh5c-f#!n*zYJJNMCnoWQ z#~oEwXJXN>5I*CtSZL3nLzl;@HFXufxjoXpW4=m6FO*7=*nP!F`*eeqP?_Fmy40u5 zX?sXtL?eoZZ94vGIBlH?>mQ9L$d*Fvv~A^@~u(D$M55rPM(fg2GD- zJFn`cK;oe#W{yqL;H1_Fc%7r)$jQO!C$wM|9A&C{u(bL6?Qa?f%qD%D@z33&bdOc6OrWDnZM=tB|1>Hzt_g5!%kE&w!(tVt z-q4PUoj!dUK*Scs-kay&H8(pgW)khyGl)VCWgnX==wA3qx^E{-?lRBmT)r=&(yQZ> zBly++xQHvqGsbTh4@SAn3Hg^TPDeL=zCm@zzgLVl$C}*I?-DAXeVHflHG;O6G}3wq zt+Lc`)xlyqzng4V*e#63WM<-57y3m32mu-+ot{aX_1BKUO_Vet?BHX$5n)B&Qqk<9 zp^IgN<{E0Tj`!pVyz^@N$UOwVIzGdUpAy?_;=NL+>D|BZWO$pZf7wOT1J1LPpvn(M z?DG;cn|@@!t*2--{Sf3c9ce3AGW66%tKGp|xz9{cvO7`M-^*O^jUufuKLwJJk-2D%fqr)uHiLR&&`*VE|d*cmpI`LklKwg zu{@iGeL>Bdg&a7NT{gKoAwYR`1u~?84Oo$+?6f5h`h6MM)1ISb;~MD zmPVWsjAD)0M!6%UMkUE=sLZ_{#Af>*A&E?)bMHpXWtCx7IthZz+RtjxpwTJ`OWpyg4nctjgsn^=FD$3(r7wRSS4cXcN zWs6MSYt=IQ6k|{q;A_5k!XuE5mx{7}q?-Vjy6n3;HhA{#Gv}Petpr1$WYiH?6P zb{)LCyawV|vT#}6*Gc+@Pj0bnIy8E3W9r$ur>HzLa5Z2;$7 zy~N<9B@ptI;}dteVCKu`icKbHt0~7(YWP5&a9T{|&6X@C80b5tbYI`WdXu6plqG_u z%ES#=gy%=Q2oV_N<13BQ#hMfZT<&Z*>B_v_y$xvDiWu z+G4qxq4FO5t;*wm?w8~w({`s7$1&(_UwLaY;0}L&tAqG{ka zNq^*f@T2~!?Uc(-f4+PNxn9;SX~nUz+xtH=omU4Jzu$dxjmhu6twN9>tfn(Tm0L1* z&9Mh3?}g)>qiltJ`z9s<(>%#9l!?Kpz(%;JZI=S?dBHGA4vl(-AS!&kjO zM7*RoYv3Y?MwIfv!LI$8BMfo%`nyzcMM}OSk*pYS^QqmwAem^de*p#|XV&4vg$wU* zHk9-_6^@Fh=S3C^uJSgl&}jzJmmKFh6C1w4U_W5%xlUbmGz3XL094rSCJ%b>Iuj&z zz!h0rzovN}Dt|rLWnYj{CNszdLANCR$3G0FHm|X+zOAL;?u=4~{l{yUE!S9=M+<&B zd9OHO#&H2qAW0Z9=V>7100L;mZt(q8D%82=vLgJN@}M zc&0XOX!{9SEgK{3)$YXWtrZnw%n-5-F!-OMg)pNstqQa~1~A{NyO$_k60J zsI4*~$!MoSoF#_<7!Fwtu*Bw#OXcW5~ny`CgbPE~*zz0i{#rjg=>oX^`a zff`_eAi;M#7&6An1nzy242&NImwPHN%m{TllFyxwDB|zj0$KJaP^3Cus^SU^_Pj2R z?TJbHfs#=I>Nj%hY%+X+O>m0!!LISkAC}D|OIV=F{DZ7u#{NO1{!@q&Z+DT?r6Ius z|3*{-O9HZ>c9FxXd3EB@N}jVH2pEGU<}@yFO*9aqEq=RHJr9!>DWjuIpQIUsyFe}c zGIqFaOb*LA<~y7fW#%~ifa}Q5<8{jRZzcuR*ABKHWvMMNFno~XLdHPM|H>cGGeAu!c;2?kFbkvcznS%g zDo404ZDEVi1`*QoL!*+|Ml&R2l7NO2c6^w$1L`Ds!jO z#)X}k+loU>?hMwU?OpMmhCP7euXFX}j(DE#6L#4cc^YDZQcpNf7f&%oo&m@9*#fEt zhK3pN4Mm%Plaf}@mm@vEGWrMOt)?95G*Kp2p|ph;7XHWDW|-!_o*HQp8%ywwx9zM+ zzzDK@>|DlTG;wT^(qqf}`9O-}x5)fcUjI+v*Kdeq*WW}2sBq@N4+G;={4g+6Y7)FE z%4zy7WU1dd1?@(@tL|bb7SaT ztdh%DtsN@vIioK2r=iZfbJb~iGTnTts4rg|BEP33us0|r!|`5#&N*XBLc6viQI;T! z=JTqE1J(B=lBw)Ib40_*a-~nVYieqW#M;506T+*I1I;+N?W#GKJ-LtR}%=Lo!H7h{gtwBO=WV`5E zj=l#lwP}+Gk-TH=*+@-D~X*?je>hB80D11Nu3n4oVZ!uLa z7IX{WlLEB$#_Y(;1Y^wfhO+|TJXvr}BK?H-tR0^6g-B${F=Pz>-Xw+Ui|oF;g{)ib z#C|%5f9n>mOW4krjO37|k9B|ZWfU~S^3iE$50+_CxF#K9^|?H{do7Vb>x;6@#bU8n zy|SZI1mKJw=e*YAVsrmk>v3=a_*##1Py()D*pQRb!7>05hk+L=**zBpAo)C_zXc9? zjo19nNW#7@LXe3Wt~VToE3@ndc&AR(j?U~RqcY&hS)P#uLqkJFN74K)BFfVC>eYSQ zwrxxPLAUJLAPYCp*MfFk#O3RQkAbj&c$~8=;2j5 zo!vL56ep?gRQYAGK+D2dEt_aAx8Yj7Bj6g0z)?pYOi{_g}a& z|H7?ZH~;HR+U3mUC)jjhOe3tX$i zDuFsuCVH3(=*QEl-Ls|_5&8R@^6n!R7@+|4@BjiJM=A`UMa$P|y)_orybf?{x5%Uc zdfr?!Jw5%2AP?L&V9Hq|c>I6(Z-u3$JGi*GtPv6S;7qT7T6Ms@YyEcfQ5?J228IjA z#A@$!`EsqId*y{zVA9ERimVH7qNVCWG1?*f0G&044HTXLsK%kHyVK%611E@2pwOT- zyY4?mabDjPlKUjwFG#6mNkL2$mh)3Wuc%QQv(}4!!LO2;*I-{#apw?y)ga3$0jDJi6ci6!?_c-&^9Z^{?FzfFWOOeguLpZg6-9JS>?eczFbRZ%A_EBf#Yj zG1m*uc`~}Bq9gB#qB!Rj?3y3+tUq+IAt6-hX4+^7)@?`|U#Gf_@|Gv6fMvD~h`1n& zu-@gV*0wR&Z8DW2s;RP2%y7@}1Jy8shYtQ8Vh4pGno$kaJeuAkCv6??@kAGZ>9r+8 ztN9MdJJ2D8?+%grOHtP5ACb|$E2VqRuD zIAT;5a;;$ze%^QjRokeWaYN2@gLdy~?r&qvk_jkov>Yp!WS^V2Cceqsth}5$i1wNY zUL4Vsm?%>u;mV~+e*G?R-_ez*FH-}Q_S_w=l!tVA-i01sNdkH-~{x4s`D zYrUK-N`PkU%*)FDQkM*T9fi*saeufXe;CqECErqGo)z@>ef3bdN}%t?cm+%@lJF_nKOI{(H|ULszeHN4i%gWA*jPB z?S&dL^Z}C{p5Aya^AU0G(0EkXDftnu&wT>5<6*#%o{gXjQi2rKdfd$Mt_jM#lhm>$ zK|`na5~OCjFs14xT6qFpv^0bsJ}ygoJ{b!9HA)<>-A=O5;d`e>&PtfC+8@=nu-ru& zGmlWZAx>&b2+uWr(eW%n)_GI7sO(rwLPQZ6JAJ&;2~cGZU{Q7gMaVEl$STuX_-B25 zl-XCB-lOMXlR$^F@I3DCdPyCAYzve1)bp5Fs6dc(X}d|=340x$y|6ueyWy2-;LuiN zt&F+i^#TDcwlmuI{xC3<@LegCh@a0#_fy}ayPYH4r{1CsD@shn^Y$B>8MRM+4uoa< z`51M##T&FA``oGs30&=f7!HTD>0G?8Zw(Kvat(RQDd z$C+g*M6tJp;j8oQ)VyeYQOn&wM}U}pzwDw z0AjikE$l2~o-*5Va?J@pZ7xJvtc#fcbiBhvKK={yTq=MP)-5p?=}QS;j!t|y=aJ<5 z-eI(WPx7o^*AcO*9gOwFU4Pr5gf7!*E=Lh~%DVpGm9o-LU z03tk>%)TbZc{tWNC5O6l0Jg9TF!loc2iK%ja}x{a{|+*5tp{?uCtC=D-Z5=I=l5W5 z2q|ynvJrM*m`vLY`k6eFjn=PKsYEvU<}mxnV`eE|C*=lSB|~kig;K`pL7N; zi$MbS)3}|m-28k#(0)L(QCa1OESQVUg~K!!{4Z_>{QJWpcAL<(bz?vTRT{F@8@dcNw69-Zu4Qu!1bi|MRtY(2mFxyVF|05e~2Tu(4`}GRvusnfR{G5 z3#hoKYJh1vNn$2#la)c<3jbGBQz)%BtAyFV^#iaSIK*0zKP`xLyIS6rr*lEI*}Z*A zDg*dnbc&|zYLERBS^tt2a1Eze3$!XgO3{=E7tPMv>0ie9pzS}_P`?Z57G$mZ&s_xn zdPl+EElk(L8CyY)yraqO15NGc?uKep%7Y(N1Ir~)MnL7szWBL~pbp$?+Oy=n3XWqN z?$0I61=Inhn(7D?$%XQ8(TC4j0UZRzI?Av%!IE-B>vCVj+-v~j{U8gnp7SCRm|yYX zt^-wf(P*VxqaXJ+1~@VnKR$do_j8kn=fc%tLPB=YBTqn;Emyas%QVgJP!$)~Nl+Dm z0ahW>J(Fu81=Ph4&G*6uNZTSxt#AfB1^a{VrjOgeHRx*7kD1-l3EeIn4xVja1#`y0JX_ZJjdCXl1gwfW1Vqk73x;XDqfZbIckPj$T=l zDS#MrT$}Tb05I@@u@~YzV`IR_lw5sT&2>1iRuh&f0(-He#1Zp@rzhF23d8iuRbwH3f|TAA76MN?Bu3E$^K zKw&1fdsb)N;Ynj>*d~n10zR1_YQtRQt=?dy^(^8@(LzN9=QE^8?Dfsx-IVx^o3vBr z%(G@WB;|^~Q`8ui-@bdDeYgIW{@)m$p)<|0*Qq_WD)9z&2AxvZQOi1E5%9kNdN1sI literal 7924 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 - + - + @@ -173,7 +173,7 @@ L12.4062 0 z " id="BitstreamVeraSans-Roman-31"/> - + @@ -181,7 +181,7 @@ z - + @@ -216,7 +216,7 @@ 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"/> - + @@ -231,7 +231,7 @@ M0 0 L4 0" id="mc8fcea1516" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + @@ -241,7 +241,7 @@ M0 0 L-4 0" id="m0d5b0a6425" style="stroke:#000000;stroke-linecap:butt;stroke-width:0.5;"/> - + @@ -305,7 +305,7 @@ Q6.59375 17.9688 6.59375 36.375 Q6.59375 54.8281 13.0625 64.5156 Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + @@ -315,17 +315,17 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + @@ -335,17 +335,17 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + @@ -355,17 +355,17 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + @@ -373,17 +373,17 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + @@ -392,17 +392,17 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + @@ -435,24 +435,331 @@ L518.4 43.2" style="fill:none;stroke:#000000;"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + +L72 231.709" style="fill:none;stroke:#000000;"/> - - + + + + + diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 1b7b15b31898..80380708c93d 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -827,15 +827,32 @@ def test_stackplot(): @image_comparison(baseline_images=['boxplot']) def test_boxplot(): + def fakeBootStrapper(data): + ''' + This is just a placeholder for the user's method of + bootstrapping the median and its confidence intervals. + + Returns an arbitrary median and confidence intervals + packed into a tuple + ''' + med, q25, q75 = np.percentile(data, [50,25,75]) + ci_lo = med - (med-q25)/2.0 + ci_hi = med + (q75-med)/3.0 + return med, (ci_lo, ci_hi) + x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) fig = plt.figure() - ax = fig.add_subplot(111) + ax1 = fig.add_subplot(211) + ax2 = fig.add_subplot(212) # show 1 boxplot with mpl medians/conf. interfals, 1 with manual values - ax.boxplot([x, x], bootstrap=10000, usermedians=[None, 1.0], + ax1.boxplot([x, x], bootstrap=10000, usermedians=[None, 1.0], conf_intervals=[None, (-1.0, 3.5)], notch=1) - ax.set_ylim((-30, 30)) + ax1.set_ylim((-30, 30)) + + ax2.boxplot([x, x], bootstrap=10000, ci_func=fakeBootStrapper, notch=1) + ax2.set_ylim((-30, 30)) @image_comparison(baseline_images=['errorbar_basic', 'errorbar_mixed']) From 2ed36c1905c43050334c89c09b65367d975b3c17 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 18:09:16 -0700 Subject: [PATCH 5/8] reran boilerplate.py --- lib/matplotlib/pyplot.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 997382e47d44..4dc71673a044 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -2413,7 +2413,7 @@ def broken_barh(xranges, yrange, hold=None, **kwargs): @_autogen_docstring(Axes.boxplot) def boxplot(x, notch=False, sym='b+', vert=True, whis=1.5, positions=None, widths=None, patch_artist=False, bootstrap=None, usermedians=None, - conf_intervals=None, hold=None): + conf_intervals=None, ci_func=None, hold=None): ax = gca() # allow callers to override the hold state by passing hold=True|False washold = ax.ishold() @@ -2424,7 +2424,8 @@ def boxplot(x, notch=False, sym='b+', vert=True, whis=1.5, positions=None, ret = ax.boxplot(x, notch=notch, sym=sym, vert=vert, whis=whis, positions=positions, widths=widths, patch_artist=patch_artist, bootstrap=bootstrap, - usermedians=usermedians, conf_intervals=conf_intervals) + usermedians=usermedians, + conf_intervals=conf_intervals, ci_func=ci_func) draw_if_interactive() finally: ax.hold(washold) @@ -3058,7 +3059,7 @@ def streamplot(x, y, u, v, density=1, linewidth=None, color=None, cmap=None, draw_if_interactive() finally: ax.hold(washold) - sci(ret.lines) + sci(ret) return ret # This function was autogenerated by boilerplate.py. Do not edit as From 31319b34208ebc775e69680ec0e9472efbccf99b Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 13 Sep 2012 18:13:37 -0700 Subject: [PATCH 6/8] added blurb in whats_new --- doc/users/whats_new.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst index ce2fd09c57e3..9e768aa7ae23 100644 --- a/doc/users/whats_new.rst +++ b/doc/users/whats_new.rst @@ -141,7 +141,8 @@ New Boxplot Functionality Users can now incorporate their own methods for computing the median and its confidence intervals into the :meth:`~matplotlib.axes.boxplot` method. For every column of data passed to boxplot, the user can specify an accompanying -median and confidence interval. +median and confidence interval. Similarly, a custom function that computes the +median and confidence interval can now be passed to `boxplot`. .. plot:: mpl_examples/pylab_examples/boxplot_demo3.py From e4183906fd703d16a39b00db1a3fef10e07a67ca Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Thu, 20 Sep 2012 14:45:05 -0700 Subject: [PATCH 7/8] fixed docstring --- lib/matplotlib/axes.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py index 2b92fa7f2676..3072bb073f6b 100644 --- a/lib/matplotlib/axes.py +++ b/lib/matplotlib/axes.py @@ -5668,24 +5668,23 @@ def boxplot(self, x, notch=False, sym='b+', vert=True, whis=1.5, A user-specified function that Computes the median and its confidence intervals. This function should return the median and the confidence intervals stored in an iterable of shape=(2,). Use - of this kwarg will override the default computation of the median - and will supercede any values supplied in the *usermedians* or - *conf_intervals* kwargs. + of this kwarg will override the default computation of the median. *usermedians* : [ default None ] An array or sequence whose first dimension (or length) is compatible with *x*. This overrides the medians computed by matplotlib for each element of *usermedians* that is not None. - When an element of *usermedians* == None, the median will be - computed directly as normal. + When an element of *usermedians* is None, boxplot computes notches + per the method specified by the other kwargs (e.g. *bootstrap*, + *ci_func*). *conf_intervals* : [ default None ] Array or sequence whose first dimension (or length) is compatible with *x* and whose second dimension is 2. When the current element of *conf_intervals* is not None, the notch locations computed by matplotlib are overridden (assuming notch is True). When an element - of *conf_intervals* is None, boxplot compute notches the method - specified by the other kwargs (e.g. *bootstrap*). + of *conf_intervals* is None, boxplot computes notches per the + method specified by the other kwargs (e.g. *bootstrap*, *ci_func*). *positions* : [ default 1,2,...,n ] Sets the horizontal positions of the boxes. The ticks and limits From e6bc68d4a306d73dde58da8d53ddd76de0decf82 Mon Sep 17 00:00:00 2001 From: Paul Hobson Date: Sat, 22 Sep 2012 00:44:00 -0700 Subject: [PATCH 8/8] refined test and updated baseline images --- .../baseline_images/test_axes/boxplot.pdf | Bin 5876 -> 5318 bytes .../baseline_images/test_axes/boxplot.png | Bin 10113 -> 8360 bytes .../baseline_images/test_axes/boxplot.svg | 650 ++++++------------ lib/matplotlib/tests/test_axes.py | 35 +- 4 files changed, 221 insertions(+), 464 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.pdf index eea7d6c0c1bcff0f654bb4a3c1f280515c649ddf..059495d2add1f0397e93da7d2a3a2c4ca5c7f215 100644 GIT binary patch delta 1304 zcmeyOdrWh~2FCie5#IU2h64M3hyUPc-}UWB?b-&fy<1%h9ApG?8?`jE1Yg}xe=*d$SADbj?raE;)tDCRR<9R94Ph&LF&aGCM|Ncq(&khFF`U&DcUD^KB9{sjf z=b%Jov8K8jveg|;6W>z;0uNGP0g-D=jG1EoA49H;*I-yisA zI@8Phvw@Iw}9KOISAM?R?9fSu-CQY%qR$#_g%aRsGp=CC3g3|Js_Myy#oc znHyXVtr<<_ifq=G){B>EYI1F?ceQ`KTy)BXiZ3c^mh*4V6E)iEX1@5OaiUFen!bPP z)WEg#Cx)L|Kh-YNWQ$|?_Qt2G>y2I~#}{r>(bel?@4m26sbs|j>!2^cnR1`OT~)5kkK5(KTno+|BJAEWY-C8k6wd;iXgh*~MVNt=1~HvLLqvh1z?JENOV zJg81oeD>;dN1wf#8neYBGOw+>!b-#Vu{^lEIymjS*K`aBHze!x|i*=wdmn(*Zgj5Qn%c5CnV&AnUFyaQ?R4N z3~AmO%Uc_xv(*b`Ht+~X?B=w#F;WWOy+g*<;?(QIU#}nMc;`7~YIT^}9ZONolS`Z~ zh`#@wWyBbjxhF$RyEkXeGgGzLCLxI{lO2Rj^tv-9TsZ%8`R@AX`RS|U`|JOoDBpk7 z^xrihgQ)9=64+GuG`HxTN_=s5stX?%pAVDYgckjeK|-N2st04|xV*nRwdJG70p`sH z$I~6RSDtCq`=rYp6#Qpxdf833niCb-3-++|aQ%3vQN-zYeqC%w>+hC`qk?MXhFS0D z9{uW}cBpB>$5P`5vnms^y?v8;JDCe!D?M0PF1_JtF6XJ%Jcc&i1ADlSY-8+e*xB7! z{oX7gT|2eg;J__D?oU}fJHG8_mUEqKo3yw1-~R5ceGlhzhjiEf(5)1nypUa*+0x8x z^8xmqJRC+w1_mZZrbd$+MV4fkm|9pU7=VC6o&pz`VPIlnYK$pnVTvJUYG8&bW@L^j zW@0h9SJao;#L#3itC&i?v7w<6x*{WUGfQ+a6JrYlbTLB{V-pN9b3+VEjSP)2JZ5BM i339M1if@g~Fg2T)0bRUQ%!S*;+|rUuRn^tsjSB!cxfa;~ delta 1891 zcmZXSc{Cf?9>>ezrFd%3C~Z~6GN?pWwX3a+r9xG0wWf5$zBhtuMN?~HU(!k&hV*eH z&Cn;dOsSa0@?NQ>D2mp;rP`(p^Jm?2@A-Yt=iJ}-_q+G}dbD@+nwo_0?CVB(DoDw- zMUT2)#rtJr8GfNMP|_?)eT+5F5r2ov3No}cbuovPc8j_EYNvSwwM_t5Xk09=96d_8Hv zBzJ?eh2+KcFO)G^d+B&sF0c%+vS#wF2xp@rvkv4dGxh|za|yZu#S;}J6*~{SXqhuz zBL2pJyrx3=jCmpNWO<`-vxvqqixFgBd7M%U#8NBLk{jlmzSz?*@D4RC&+RJVMY_Z~ z!4z<@&H=>C#_>z)^ghLlvuAB?w^BT0BIz(0N_is1BSWkKA4S1}3JngE5*p01RdnR%HKRr>!7R=7q z;8lS-E_ol%9nr=IZx&S62u}ed_J@Zflfd|3FS*0hyImrlK`iTlX<jQe9ar10` z2Fc5|B#8Re<~2NV$h=8DC2${f+5a@pF%AwTyjyrfAnCD9(mF;^au@XV+$ML) z9ZUdY&y5H8(C8!B5fn8k?%PXC;Dfhb3EXY)IUU1o;oQQWU;BJyls`EvteMm{jOC7w zSyn0o<5QwI)d%WjBJtb)nv>F*qMQ>XPD|8QCUTv%KL2@T;lj7gkcJimxMS&q#BTEF zg}`5^#8T#!w!$n5@J%QqZA}dDYd<<5QXGW2Hz0Ic}pa`aW`5|Gm-^z=n~rXkw#ib|_9zb1%6ElRgoDPvZ`i&ao|mwtF6^ zm=-0XmGXpu=Wi)=-1?ToXN1+v;7OHZhT6jB_|f$IvsZ8NwHqjr__D z6KZic>EA;+I4L=?ceXV~DQjrHQTU>6s#{m9|AUqRU({Di^b8p#Q_!hr6wI1zqi> z6Q45ORQgAHL;L1~>W4K8vhI%Uug6O&nFYvBr9dhlNuRs>p2pH4QK)rauDFvZ3_i#V z(kJsM2W=XL=g6kkm}4+sb*i1XeQ)mVn}F`jC*VIAU)P)kE;=M;W8!YL+a^-!cMpfC z&GVpI)^}D2b`21rni};uv&1RJkepx4y>!RTaIRu^UHd)gtXl16vdas;(&(NBHb!nU zepRc!a^fmu|D}Q7?8vD{DzDgISo9qr?b_4WXWz3vr96IqaWD%=tXG+iIQU5lN_7wq z#;OFx#6}1EhabwIh=4G02t*aE`j3DcKpBOit&#u;6oP~sLck=n?2}t?2n?YLK3b|+ zRq=lW7!E$l`jNq)#~A{4oT1>y7zB(U`N=uz7$T4PLQ%)>LlHN?Kel&v^ x8XEk_3=ELRiW(qL#~x;Yf*))6=rexwgByU4a!JYZ77}nM94QV0Sv%W^{|%C+UV8ul diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.png index b58fabfacc85939b6da0247270dd23751baa39ad..9ab5fafc486962563a4e0d9eb2338d0a4e458b8b 100644 GIT binary patch literal 8360 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 h{|oRhPT{gRFn8n`*0E120l*S;&e+1J;k literal 10113 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 diff --git a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg index 171a9b0712a1..aba24f02b892 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/boxplot.svg @@ -21,51 +21,51 @@ z - + - + - + - + - + - + @@ -75,77 +75,126 @@ L3 0 M0 3 L0 -3" id="me594928b4b" style="stroke:#0000ff;stroke-linecap:butt;stroke-width:0.5;"/> - - + + - - + + - + - + - + - + - + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + @@ -216,45 +265,26 @@ 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"/> - + - - - - - - - + + - + - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -313,19 +382,19 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + - + - + - + @@ -333,19 +402,19 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + - + - + - + @@ -353,73 +422,73 @@ Q19.5312 74.2188 31.7812 74.2188" id="BitstreamVeraSans-Roman-30"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -435,331 +504,24 @@ L518.4 43.2" style="fill:none;stroke:#000000;"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +L72 43.2" style="fill:none;stroke:#000000;"/> - - - - - + + diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 80380708c93d..7f3ddfc9debf 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -827,32 +827,27 @@ def test_stackplot(): @image_comparison(baseline_images=['boxplot']) def test_boxplot(): - def fakeBootStrapper(data): - ''' - This is just a placeholder for the user's method of - bootstrapping the median and its confidence intervals. - - Returns an arbitrary median and confidence intervals - packed into a tuple - ''' - med, q25, q75 = np.percentile(data, [50,25,75]) - ci_lo = med - (med-q25)/2.0 - ci_hi = med + (q75-med)/3.0 - return med, (ci_lo, ci_hi) + + def myCIs(data): + return 1, (-2, 2) x = np.linspace(-7, 7, 140) x = np.hstack([-25, x, 25]) fig = plt.figure() - ax1 = fig.add_subplot(211) - ax2 = fig.add_subplot(212) + ax = fig.add_subplot(111) + + # show 1 boxplot with mpl medians/conf. interfals, 1 with manual values, + # and one using a function + ax.boxplot(x, bootstrap=10000, positions=[1], notch=1, + usermedians=[None,], conf_intervals=[None]) - # show 1 boxplot with mpl medians/conf. interfals, 1 with manual values - ax1.boxplot([x, x], bootstrap=10000, usermedians=[None, 1.0], - conf_intervals=[None, (-1.0, 3.5)], notch=1) - ax1.set_ylim((-30, 30)) + ax.boxplot(x, bootstrap=10000, positions=[2], notch=1, + usermedians=[1.0], conf_intervals=[(-1.0, 3.5)]) - ax2.boxplot([x, x], bootstrap=10000, ci_func=fakeBootStrapper, notch=1) - ax2.set_ylim((-30, 30)) + ax.boxplot(x, bootstrap=10000, notch=1, positions=[3], ci_func=myCIs) + ax.set_ylim((-30, 30)) + ax.set_xlim((0,4)) + ax.set_xticks([1,2,3]) @image_comparison(baseline_images=['errorbar_basic', 'errorbar_mixed'])