summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-11-15 10:23:11 -0800
committerCharles Harris <charlesr.harris@gmail.com>2013-11-15 10:23:11 -0800
commit843792b6d349133114930911424772e6bbbc0c9c (patch)
treed21b2d4a8752e8c49bcd5e8015b0376894462845 /numpy
parent1ebbd5cf03546be6b5bed727f89eb98c6cdf5d15 (diff)
parent9f8639aaf2791f3f6e2f5e9f28877314f35db1a3 (diff)
downloadnumpy-843792b6d349133114930911424772e6bbbc0c9c.tar.gz
Merge pull request #4047 from arunpersaud/convolve_doc
DOC: use variable names in formula for convolve
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/numeric.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 1ed339401..39e5a4cd5 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -906,6 +906,8 @@ def convolve(a,v,mode='full'):
distributed according to the convolution of their individual
distributions.
+ If `v` is longer than `a`, the arrays are swapped before computation.
+
Parameters
----------
a : (N,) array_like
@@ -944,7 +946,7 @@ def convolve(a,v,mode='full'):
-----
The discrete convolution operation is defined as
- .. math:: (f * g)[n] = \\sum_{m = -\\infty}^{\\infty} f[m] g[n - m]
+ .. math:: (a * v)[n] = \\sum_{m = -\\infty}^{\\infty} a[m] v[n - m]
It can be shown that a convolution :math:`x(t) * y(t)` in time/space
is equivalent to the multiplication :math:`X(f) Y(f)` in the Fourier