Commit c5a64d2

committed

Deprecate proj3d.mod.

Having a function named mod that doesn't do % but computes the norm of a vector is just a good way to trip the reader (yes, I know about the term "modulus of a vector", but still). Also vectorize a normals calculation. Also we can use % instead of np.mod elsewhere.

1 parent 0fec7f1 commit c5a64d2Copy full SHA for c5a64d2

File tree

5 files changed

+20

-13

lines changed

doc/api/next_api_changes
- 2018年12月19日-AL-deprecations.rst
lib
- matplotlib
  - quiver.py
  - tri
    - triinterpolate.py
- mpl_toolkits/mplot3d
  - axes3d.py
  - proj3d.py

5 files changed

+20

-13

lines changed

`‎doc/api/next_api_changes/2018-12-19-AL-deprecations.rst`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+Deprecations`
	`2`	+````````````
	`3`	`+`
	`4`	+``mpl_toolkits.mplot3d.proj3d.mod`` is deprecated; use `numpy.linalg.norm`
	`5`	`+instead.`

`‎lib/matplotlib/quiver.py`

Lines changed: 2 additions & 2 deletions

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

`‎lib/matplotlib/tri/triinterpolate.py`

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).`

`‎lib/mpl_toolkits/mplot3d/axes3d.py`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,7 @@ def get_proj(self):`
`1030`	`1030`
`1031`	`1031`	`self.eye = E`
`1032`	`1032`	`self.vvec = R - E`
`1033`		`- self.vvec = self.vvec / proj3d.mod(self.vvec)`
	`1033`	`+ self.vvec = self.vvec / np.linalg.norm(self.vvec)`
`1034`	`1034`
`1035`	`1035`	`if abs(relev) > np.pi/2:`
`1036`	`1036`	`# upside down`
`@@ -1768,9 +1768,9 @@ def _shade_colors(self, color, normals, lightsource=None):`
`1768`	`1768`	`# chosen for backwards-compatibility`
`1769`	`1769`	`lightsource = LightSource(azdeg=225, altdeg=19.4712)`
`1770`	`1770`
`1771`		`- shade=np.array([np.dot(n/proj3d.mod(n), lightsource.direction)`
`1772`		`- ifproj3d.mod(n) elsenp.nan`
`1773`		`- forninnormals])`
	`1771`	`+ withnp.errstate(invalid="ignore"):`
	`1772`	`+ shade= ((normals/np.linalg.norm(normals, axis=1, keepdims=True))`
	`1773`	`+ @ lightsource.direction)`
`1774`	`1774`	`mask = ~np.isnan(shade)`
`1775`	`1775`
`1776`	`1776`	`if mask.any():`

`‎lib/mpl_toolkits/mplot3d/proj3d.py`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-# 3dproj.py`
`2`		`-#`
`3`	`1`	`"""`
`4`	`2`	`Various transforms used for by the 3D code`
`5`	`3`	`"""`
	`4`	`+`
`6`	`5`	`import numpy as np`
`7`	`6`	`import numpy.linalg as linalg`
`8`	`7`
	`8`	`+from matplotlib import cbook`
	`9`	`+`
`9`	`10`
`10`	`11`	`def line2d(p0, p1):`
`11`	`12`	`"""`
`@@ -62,6 +63,7 @@ def line2d_seg_dist(p1, p2, p0):`
`62`	`63`	`return d`
`63`	`64`
`64`	`65`
	`66`	`+@cbook.deprecated("3.1", alternative="np.linalg.norm")`
`65`	`67`	`def mod(v):`
`66`	`68`	`"""3d vector length"""`
`67`	`69`	`return np.sqrt(v[0]2+v[1]2+v[2]**2)`
`@@ -80,9 +82,9 @@ def world_transformation(xmin, xmax,`
`80`	`82`	`def view_transformation(E, R, V):`
`81`	`83`	`n = (E - R)`
`82`	`84`	`## new`
`83`		`-# n /= mod(n)`
	`85`	`+# n /= np.linalg.norm(n)`
`84`	`86`	`# u = np.cross(V,n)`
`85`		`-# u /= mod(u)`
	`87`	`+# u /= np.linalg.norm(u)`
`86`	`88`	`# v = np.cross(n,u)`
`87`	`89`	`# Mr = np.diag([1.]*4)`
`88`	`90`	`# Mt = np.diag([1.]*4)`
`@@ -91,9 +93,9 @@ def view_transformation(E, R, V):`
`91`	`93`	`## end new`
`92`	`94`
`93`	`95`	`## old`
`94`		`- n = n / mod(n)`
	`96`	`+ n = n / np.linalg.norm(n)`
`95`	`97`	`u = np.cross(V, n)`
`96`		`- u = u / mod(u)`
	`98`	`+ u = u / np.linalg.norm(u)`
`97`	`99`	`v = np.cross(n, u)`
`98`	`100`	`Mr = [[u[0], u[1], u[2], 0],`
`99`	`101`	`[v[0], v[1], v[2], 0],`

0 commit comments

Comments

(0)

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!

Commit c5a64d2

File tree

5 files changed

5 files changed

`‎doc/api/next_api_changes/2018-12-19-AL-deprecations.rst`

`‎lib/matplotlib/quiver.py`

`‎lib/matplotlib/tri/triinterpolate.py`

`‎lib/mpl_toolkits/mplot3d/axes3d.py`

`‎lib/mpl_toolkits/mplot3d/proj3d.py`

0 commit comments