NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commitcb904b1

authored

Merge pull request#16430 from anntzer/unarray

DOC: Remove unnecessary calls to np.array in examples.

2 parentsb66fecd +b5155b7 commitcb904b1Copy full SHA for cb904b1

File tree

20 files changed

+54

-58

lines changed

examples
- animation
  - animated_histogram.py
- images_contours_and_fields
  - image_annotated_heatmap.py
- lines_bars_and_markers
- misc
  - histogram_path.py
- pie_and_polar_charts
  - nested_pie.py
- scales
  - logit_demo.py
- shapes_and_collections
- specialty_plots
  - leftventricle_bulleye.py
- statistics
- subplots_axes_and_figures
  - axes_box_aspect.py
- text_labels_and_annotations
  - custom_legends.py
  - text_rotation_relative_to_line.py
- ticks_and_spines
  - date_concise_formatter.py
- units
  - ellipse_with_units.py

20 files changed

+54

-58

lines changed

`‎examples/animation/animated_histogram.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`n,bins=np.histogram(data,100)`
`22`	`22`
`23`	`23`	`# get the corners of the rectangles for the histogram`
`24`		`-left=np.array(bins[:-1])`
`25`		`-right=np.array(bins[1:])`
	`24`	`+left=bins[:-1]`
	`25`	`+right=bins[1:]`
`26`	`26`	`bottom=np.zeros(len(left))`
`27`	`27`	`top=bottom+n`
`28`	`28`	`nrects=len(left)`

`‎examples/images_contours_and_fields/image_annotated_heatmap.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ def annotate_heatmap(im, data=None, valfmt="{x:.2f}",`
`271`	`271`	`y= ["Prod. {}".format(i)foriinrange(10,70,10)]`
`272`	`272`	`x= ["Cycle {}".format(i)foriinrange(1,7)]`
`273`	`273`
`274`		`-qrates=np.array(list("ABCDEFG"))`
	`274`	`+qrates=list("ABCDEFG")`
`275`	`275`	`norm=matplotlib.colors.BoundaryNorm(np.linspace(-3.5,3.5,8),7)`
`276`	`276`	`fmt=matplotlib.ticker.FuncFormatter(lambdax,pos:qrates[::-1][norm(x)])`
`277`	`277`

`‎examples/lines_bars_and_markers/eventplot_demo.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# set different line properties for each set of positions`
`26`	`26`	`# note that some overlap`
`27`		`-lineoffsets1=np.array([-15,-3,1,1.5,6,10])`
	`27`	`+lineoffsets1= [-15,-3,1,1.5,6,10]`
`28`	`28`	`linelengths1= [5,2,1,1,3,1.5]`
`29`	`29`
`30`	`30`	`fig,axs=plt.subplots(2,2)`

`‎examples/lines_bars_and_markers/scatter_star_poly.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`axs[0,1].set_title(r"marker=r'\$\alpha\$'")`
`29`	`29`
`30`	`30`	`# marker from path`
`31`		`-verts=np.array([[-1,-1], [1,-1], [1,1], [-1,-1]])`
	`31`	`+verts= [[-1,-1], [1,-1], [1,1], [-1,-1]]`
`32`	`32`	`axs[0,2].scatter(x,y,s=80,c=z,marker=verts)`
`33`	`33`	`axs[0,2].set_title("marker=verts")`
`34`	`34`

`‎examples/lines_bars_and_markers/timeline.py‎`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,11 @@`
`81`	`81`	`markerline.set_ydata(np.zeros(len(dates)))`
`82`	`82`
`83`	`83`	`# annotate lines`
`84`		`-vert=np.array(['top','bottom'])[(levels>0).astype(int)]`
`85`		`-ford,l,r,vainzip(dates,levels,names,vert):`
`86`		`-ax.annotate(r,xy=(d,l),xytext=(-3,np.sign(l)*3),`
`87`		`-textcoords="offset points",va=va,ha="right")`
	`84`	`+ford,l,rinzip(dates,levels,names):`
	`85`	`+ax.annotate(r,xy=(d,l),`
	`86`	`+xytext=(-3,np.sign(l)*3),textcoords="offset points",`
	`87`	`+horizontalalignment="right",`
	`88`	`+verticalalignment="bottom"ifl>0else"top")`
`88`	`89`
`89`	`90`	`# format xaxis with 4 month intervals`
`90`	`91`	`ax.get_xaxis().set_major_locator(mdates.MonthLocator(interval=4))`

`‎examples/misc/histogram_path.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@`
`31`	`31`	`n,bins=np.histogram(data,50)`
`32`	`32`
`33`	`33`	`# get the corners of the rectangles for the histogram`
`34`		`-left=np.array(bins[:-1])`
`35`		`-right=np.array(bins[1:])`
	`34`	`+left=bins[:-1]`
	`35`	`+right=bins[1:]`
`36`	`36`	`bottom=np.zeros(len(left))`
`37`	`37`	`top=bottom+n`
`38`	`38`

`‎examples/pie_and_polar_charts/nested_pie.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`
`33`	`33`	`cmap=plt.get_cmap("tab20c")`
`34`	`34`	`outer_colors=cmap(np.arange(3)*4)`
`35`		`-inner_colors=cmap(np.array([1,2,5,6,9,10]))`
	`35`	`+inner_colors=cmap([1,2,5,6,9,10])`
`36`	`36`
`37`	`37`	`ax.pie(vals.sum(axis=1),radius=1,colors=outer_colors,`
`38`	`38`	`wedgeprops=dict(width=size,edgecolor='w'))`
`@@ -63,7 +63,7 @@`
`63`	`63`
`64`	`64`	`cmap=plt.get_cmap("tab20c")`
`65`	`65`	`outer_colors=cmap(np.arange(3)*4)`
`66`		`-inner_colors=cmap(np.array([1,2,5,6,9,10]))`
	`66`	`+inner_colors=cmap([1,2,5,6,9,10])`
`67`	`67`
`68`	`68`	`ax.bar(x=valsleft[:,0],`
`69`	`69`	`width=valsnorm.sum(axis=1),bottom=1-size,height=size,`

`‎examples/scales/logit_demo.py‎`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,17 @@`
`6`	`6`	`Examples of plots with logit axes.`
`7`	`7`	`"""`
`8`	`8`
	`9`	`+importmath`
	`10`	`+`
`9`	`11`	`importnumpyasnp`
`10`	`12`	`importmatplotlib.pyplotasplt`
`11`	`13`
`12`	`14`	`xmax=10`
`13`	`15`	`x=np.linspace(-xmax,xmax,10000)`
`14`		`-cdf_norm=np.array([np.math.erf(w/np.sqrt(2))/2+1/2forwinx])`
`15`		`-cdf_laplacian=np.array(`
`16`		`- [1/2np.exp(w)ifw<0else1-1/2np.exp(-w)forwinx]`
`17`		`-)`
`18`		`-cdf_cauchy=1/np.pi*np.arctan(x)+1/2`
	`16`	`+cdf_norm= [math.erf(w/np.sqrt(2))/2+1/2forwinx]`
	`17`	`+cdf_laplacian= [1/2np.exp(w)ifw<0else1-1/2np.exp(-w)`
	`18`	`+forwinx]`
	`19`	`+cdf_cauchy=np.arctan(x)/np.pi+1/2`
`19`	`20`
`20`	`21`	`fig,axs=plt.subplots(nrows=3,ncols=2,figsize=(6.4,8.5))`
`21`	`22`

`‎examples/shapes_and_collections/artist_reference.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ def label(xy, text):`
`86`	`86`	`label(grid[7],"FancyBboxPatch")`
`87`	`87`
`88`	`88`	`# add a line`
`89`		`-x,y=np.array([[-0.06,0.0,0.1], [0.05,-0.05,0.05]])`
	`89`	`+x,y=([-0.06,0.0,0.1], [0.05,-0.05,0.05])`
`90`	`90`	`line=mlines.Line2D(x+grid[8,0],y+grid[8,1],lw=5.,alpha=0.3)`
`91`	`91`	`label(grid[8],"Line2D")`
`92`	`92`
`93`	`93`	`colors=np.linspace(0,1,len(patches))`
`94`	`94`	`collection=PatchCollection(patches,cmap=plt.cm.hsv,alpha=0.3)`
`95`		`-collection.set_array(np.array(colors))`
	`95`	`+collection.set_array(colors)`
`96`	`96`	`ax.add_collection(collection)`
`97`	`97`	`ax.add_line(line)`
`98`	`98`

`‎examples/shapes_and_collections/compound_path.py‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,11 @@`
`7`	`7`	and a triangle. Use ``CLOSEPOLY`` and ``MOVETO`` for the different parts of
`8`	`8`	`the compound path`
`9`	`9`	`"""`
`10`		`-importnumpyasnp`
	`10`	`+`
`11`	`11`	`frommatplotlib.pathimportPath`
`12`	`12`	`frommatplotlib.patchesimportPathPatch`
`13`	`13`	`importmatplotlib.pyplotasplt`
`14`	`14`
`15`		`-`
`16`	`15`	`vertices= []`
`17`	`16`	`codes= []`
`18`	`17`
`@@ -22,7 +21,6 @@`
`22`	`21`	`codes+= [Path.MOVETO]+ [Path.LINETO]*2+ [Path.CLOSEPOLY]`
`23`	`22`	`vertices+= [(4,4), (5,5), (5,4), (0,0)]`
`24`	`23`
`25`		`-vertices=np.array(vertices,float)`
`26`	`24`	`path=Path(vertices,codes)`
`27`	`25`
`28`	`26`	`pathpatch=PathPatch(path,facecolor='None',edgecolor='green')`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitcb904b1

File tree

20 files changed

20 files changed

`‎examples/animation/animated_histogram.py‎`

`‎examples/images_contours_and_fields/image_annotated_heatmap.py‎`

`‎examples/lines_bars_and_markers/eventplot_demo.py‎`

`‎examples/lines_bars_and_markers/scatter_star_poly.py‎`

`‎examples/lines_bars_and_markers/timeline.py‎`

`‎examples/misc/histogram_path.py‎`

`‎examples/pie_and_polar_charts/nested_pie.py‎`

`‎examples/scales/logit_demo.py‎`

`‎examples/shapes_and_collections/artist_reference.py‎`

`‎examples/shapes_and_collections/compound_path.py‎`

0 commit comments