diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-12 15:50:31 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-12 15:50:31 -0400 |
| commit | f10e636d48a8bb0618951b179505e734f47c5014 (patch) | |
| tree | 7ea8aff2e14b3387c5773d00ee28f298300dc14a /numpy/core/numeric.py | |
| parent | c45a8f8a0f4bcedc10231c61ae8034c34443aa4b (diff) | |
| parent | 5ebae3697b055c90a484bd39400c4de1c54964ad (diff) | |
| download | numpy-f10e636d48a8bb0618951b179505e734f47c5014.tar.gz | |
Merge pull request #6200 from bsipocz/convolve_docstring_link_fix
DOC: Changing invalid links to strings
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index fd53b5c72..f0163876f 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -849,7 +849,7 @@ def correlate(a, v, mode='valid'): Input sequences. mode : {'valid', 'same', 'full'}, optional Refer to the `convolve` docstring. Note that the default - is `valid`, unlike `convolve`, which uses `full`. + is 'valid', unlike `convolve`, which uses 'full'. old_behavior : bool `old_behavior` was removed in NumPy 1.10. If you need the old behavior, use `multiarray.correlate`. @@ -924,11 +924,11 @@ def convolve(a,v,mode='full'): completely, and boundary effects may be seen. 'same': - Mode `same` returns output of length ``max(M, N)``. Boundary + Mode 'same' returns output of length ``max(M, N)``. Boundary effects are still visible. 'valid': - Mode `valid` returns output of length + Mode 'valid' returns output of length ``max(M, N) - min(M, N) + 1``. The convolution product is only given for points where the signals overlap completely. Values outside the signal boundary have no effect. |