diff options
author | Eric Wieser <wieser.eric@gmail.com> | 2019-03-16 10:06:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-16 10:06:39 -0700 |
commit | 9a35ab439809270dfb582ed1ddf0376512ec4005 (patch) | |
tree | 763e0904dd9e2c370596a40c049e82b3298560a3 /numpy/polynomial/hermite.py | |
parent | 0764929543c85decde9d664367dbf7d8f137fe1f (diff) | |
parent | df286d00bf6236f0158fc2cedd91dd3905fc05ca (diff) | |
download | numpy-9a35ab439809270dfb582ed1ddf0376512ec4005.tar.gz |
Merge branch 'master' into deprecate-float-order
Diffstat (limited to 'numpy/polynomial/hermite.py')
-rw-r--r-- | numpy/polynomial/hermite.py | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/numpy/polynomial/hermite.py b/numpy/polynomial/hermite.py index e925c4304..6dee0b359 100644 --- a/numpy/polynomial/hermite.py +++ b/numpy/polynomial/hermite.py @@ -1211,17 +1211,7 @@ def hermvander2d(x, y, deg): .. versionadded:: 1.7.0 """ - ideg = [int(d) for d in deg] - is_valid = [id == d and id >= 0 for id, d in zip(ideg, deg)] - if is_valid != [1, 1]: - raise ValueError("degrees must be non-negative integers") - degx, degy = ideg - x, y = np.array((x, y), copy=0) + 0.0 - - vx = hermvander(x, degx) - vy = hermvander(y, degy) - v = vx[..., None]*vy[..., None,:] - return v.reshape(v.shape[:-2] + (-1,)) + return pu._vander2d(hermvander, x, y, deg) def hermvander3d(x, y, z, deg): @@ -1275,18 +1265,7 @@ def hermvander3d(x, y, z, deg): .. versionadded:: 1.7.0 """ - ideg = [int(d) for d in deg] - is_valid = [id == d and id >= 0 for id, d in zip(ideg, deg)] - if is_valid != [1, 1, 1]: - raise ValueError("degrees must be non-negative integers") - degx, degy, degz = ideg - x, y, z = np.array((x, y, z), copy=0) + 0.0 - - vx = hermvander(x, degx) - vy = hermvander(y, degy) - vz = hermvander(z, degz) - v = vx[..., None, None]*vy[..., None,:, None]*vz[..., None, None,:] - return v.reshape(v.shape[:-3] + (-1,)) + return pu._vander3d(hermvander, x, y, z, deg) def hermfit(x, y, deg, rcond=None, full=False, w=None): |