Commit665cf51

authored

Merge pull request#13020 from anntzer/proj3dmod

Deprecate proj3d.mod.

2 parentsb6e8c19 +114209a commit665cf51Copy full SHA for 665cf51

File tree

+14

-20

lines changed

+14

-20

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -983,10 +983,10 @@ def _find_tails(self, mag, rounding=True, half=5, full=10, flag=50):`
`983`	`983`	`mag=half* (mag/half+0.5).astype(int)`
`984`	`984`
`985`	`985`	`num_flags=np.floor(mag/flag).astype(int)`
`986`		`-mag=np.mod(mag,flag)`
	`986`	`+mag=mag%flag`
`987`	`987`
`988`	`988`	`num_barb=np.floor(mag/full).astype(int)`
`989`		`-mag=np.mod(mag,full)`
	`989`	`+mag=mag%full`
`990`	`990`
`991`	`991`	`half_flag=mag>=half`
`992`	`992`	`empty_flag=~(half_flag\| (num_flags>0)\| (num_barb>0))`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1135,7 +1135,7 @@ def compute_geom_weights(self):`
`1135`	`1135`	`alpha2=np.arctan2(p2[:,1]-p0[:,1],p2[:,0]-p0[:,0])`
`1136`	`1136`	`# In the below formula we could take modulo 2. but`
`1137`	`1137`	`# modulo 1. is safer regarding round-off errors (flat triangles).`
`1138`		`-angle=np.abs(np.mod((alpha2-alpha1)/np.pi,1.))`
	`1138`	`+angle=np.abs(((alpha2-alpha1)/np.pi)%1)`
`1139`	`1139`	`# Weight proportional to angle up np.pi/2; null weight for`
`1140`	`1140`	# degenerated cases 0 and np.pi (note that `angle` is normalized
`1141`	`1141`	`# by np.pi).`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,7 @@ def get_proj(self):`
`1027`	`1027`
`1028`	`1028`	`self.eye=E`
`1029`	`1029`	`self.vvec=R-E`
`1030`		`-self.vvec=self.vvec/proj3d._mod(self.vvec)`
	`1030`	`+self.vvec=self.vvec/np.linalg.norm(self.vvec)`
`1031`	`1031`
`1032`	`1032`	`ifabs(relev)>np.pi/2:`
`1033`	`1033`	`# upside down`
`@@ -1762,9 +1762,9 @@ def _shade_colors(self, color, normals, lightsource=None):`
`1762`	`1762`	`# chosen for backwards-compatibility`
`1763`	`1763`	`lightsource=LightSource(azdeg=225,altdeg=19.4712)`
`1764`	`1764`
`1765`		`-shade=np.array([np.dot(n/proj3d._mod(n),lightsource.direction)`
`1766`		`-ifproj3d._mod(n)elsenp.nan`
`1767`		`-forninnormals])`
	`1765`	`+withnp.errstate(invalid="ignore"):`
	`1766`	`+shade= ((normals/np.linalg.norm(normals,axis=1,keepdims=True))`
	`1767`	`+@lightsource.direction)`
`1768`	`1768`	`mask=~np.isnan(shade)`
`1769`	`1769`
`1770`	`1770`	`ifmask.any():`

Lines changed: 7 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-# 3dproj.py`
`2`		`-#`
`3`	`1`	`"""`
`4`	`2`	`Various transforms used for by the 3D code`
`5`	`3`	`"""`
	`4`	`+`
`6`	`5`	`importnumpyasnp`
`7`	`6`	`importnumpy.linalgaslinalg`
`8`	`7`
`@@ -79,15 +78,10 @@ def line2d_seg_dist(p1, p2, p0):`
`79`	`78`	`return_line2d_seg_dist(p1,p2,p0)`
`80`	`79`
`81`	`80`
`82`		`-def_mod(v):`
`83`		`-"""3d vector length"""`
`84`		`-returnnp.sqrt(v[0]2+v[1]2+v[2]**2)`
`85`		`-`
`86`		`-`
`87`		`-@cbook.deprecated("3.1")`
	`81`	`+@cbook.deprecated("3.1",alternative="np.linalg.norm")`
`88`	`82`	`defmod(v):`
`89`	`83`	`"""3d vector length"""`
`90`		`-return_mod(v)`
	`84`	`+returnnp.sqrt(v[0]2+v[1]2+v[2]**2)`
`91`	`85`
`92`	`86`
`93`	`87`	`defworld_transformation(xmin,xmax,`
`@@ -103,9 +97,9 @@ def world_transformation(xmin, xmax,`
`103`	`97`	`defview_transformation(E,R,V):`
`104`	`98`	`n= (E-R)`
`105`	`99`	`## new`
`106`		`-# n /=mod(n)`
	`100`	`+# n /=np.linalg.norm(n)`
`107`	`101`	`# u = np.cross(V,n)`
`108`		`-# u /=mod(u)`
	`102`	`+# u /=np.linalg.norm(u)`
`109`	`103`	`# v = np.cross(n,u)`
`110`	`104`	`# Mr = np.diag([1.]*4)`
`111`	`105`	`# Mt = np.diag([1.]*4)`
`@@ -114,9 +108,9 @@ def view_transformation(E, R, V):`
`114`	`108`	`## end new`
`115`	`109`
`116`	`110`	`## old`
`117`		`-n=n/_mod(n)`
	`111`	`+n=n/np.linalg.norm(n)`
`118`	`112`	`u=np.cross(V,n)`
`119`		`-u=u/_mod(u)`
	`113`	`+u=u/np.linalg.norm(u)`
`120`	`114`	`v=np.cross(n,u)`
`121`	`115`	`Mr= [[u[0],u[1],u[2],0],`
`122`	`116`	`[v[0],v[1],v[2],0],`

Comments

(0)