summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscimax <max.kellermeier@hotmail.de>2020-08-20 11:49:22 +0200
committerGitHub <noreply@github.com>2020-08-20 11:49:22 +0200
commitde7aa73c56d8128e3fa5cca1e99ff352fffdf0c5 (patch)
tree24794064bcc0e4d6a93c668a9584a18c57089ccd
parent16e3bec1744c39915e7ec3e490529c01e2cbde7a (diff)
downloadnumpy-de7aa73c56d8128e3fa5cca1e99ff352fffdf0c5.tar.gz
Minor code clean up
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
-rw-r--r--doc/release/upcoming_changes/16987.improvement.rst5
-rw-r--r--numpy/lib/function_base.py6
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/release/upcoming_changes/16987.improvement.rst b/doc/release/upcoming_changes/16987.improvement.rst
index 28acc1ce2..9ff81380a 100644
--- a/doc/release/upcoming_changes/16987.improvement.rst
+++ b/doc/release/upcoming_changes/16987.improvement.rst
@@ -9,6 +9,5 @@ intervals.
>>> phase_deg = np.mod(np.linspace(0,720,19), 360) - 180
>>> unwrap(phase_deg, interval_size=360)
array([-180., -140., -100., -60., -20., 20., 60., 100., 140.,
- 180., 220., 260., 300., 340., 380., 420., 460., 500.,
- 540.])
-
+ 180., 220., 260., 300., 340., 380., 420., 460., 500.,
+ 540.])
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 910c2bc43..3115f7a80 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -1482,7 +1482,7 @@ def angle(z, deg=False):
return a
-def _unwrap_dispatcher(p, discont=None, axis=None, *, interval_size=2*pi):
+def _unwrap_dispatcher(p, discont=None, axis=None, *, interval_size=None):
return (p,)
@@ -1551,11 +1551,13 @@ def unwrap(p, discont=None, axis=-1, *, interval_size=2*pi):
slice1[axis] = slice(1, None)
slice1 = tuple(slice1)
ddmod = mod(dd + interval_size/2, interval_size) - interval_size/2
+ # the above line made `ddmod[abs(dd) == interval_size/2] == -interval_size/2`.
+ # correct these such that `ddmod[abs(dd) == interval_size/2] == sign(dd)*interval_size/2`.
_nx.copyto(ddmod, interval_size/2, where=(ddmod == -interval_size/2) & (dd > 0))
ph_correct = ddmod - dd
_nx.copyto(ph_correct, 0, where=abs(dd) < discont)
up = array(p, copy=True, dtype='d')
- up[slice1] = p[slice1] + ph_correct.cumsum(axis)
+ up[slice1] = p[slice1] + ph_correct.cumsum(axis)
return up