diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-07-07 15:03:31 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-07-07 16:07:16 +0200 |
| commit | 0e9e1076b0768236664259c8895d944c1d251b50 (patch) | |
| tree | 58b1d5dfd1288fdc4363d2ee0c644735d94dc857 /numpy/lib/function_base.py | |
| parent | 2c9981b61ca56b41a5e7b9fbe785b6b54727aea4 (diff) | |
| download | numpy-0e9e1076b0768236664259c8895d944c1d251b50.tar.gz | |
DOC: merge doc wiki edits. A number of small edits in linalg and lib.
Diffstat (limited to 'numpy/lib/function_base.py')
| -rw-r--r-- | numpy/lib/function_base.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 6a457010b..a0781ebf9 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -843,7 +843,7 @@ def gradient(f, *varargs): Returns ------- - g : ndarray + gradient : ndarray N arrays of the same shape as `f` giving the derivative of `f` with respect to each dimension. @@ -948,7 +948,7 @@ def diff(a, n=1, axis=-1): Returns ------- - out : ndarray + diff : ndarray The `n` order differences. The shape of the output is the same as `a` except along `axis` where the dimension is smaller by `n`. @@ -1284,6 +1284,11 @@ def extract(condition, arr): arr : array_like Input array of the same size as `condition`. + Returns + ------- + extract : ndarray + Rank 1 array of values from `arr` where `condition` is True. + See Also -------- take, put, copyto, compress @@ -2714,7 +2719,7 @@ def kaiser(M,beta): A beta value of 14 is probably a good starting point. Note that as beta gets large, the window narrows, and so the number of samples needs to be - large enough to sample the increasingly narrow spike, otherwise nans will + large enough to sample the increasingly narrow spike, otherwise NaNs will get returned. Most references to the Kaiser window come from the signal processing |