diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-09 10:32:37 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-09 10:32:37 -0700 |
| commit | 695e78d4d78038a7f694ab2701f28d84a58db664 (patch) | |
| tree | 853ac441500074f6a963c743b12931f7d04d9594 | |
| parent | 8ca48314787fe440b0f4efadb915f2ffb207fadc (diff) | |
| parent | a8c97b94c7a8d41fa9a887d64b25b5253dd2ef4b (diff) | |
| download | numpy-695e78d4d78038a7f694ab2701f28d84a58db664.tar.gz | |
Merge pull request #6982 from charris/update-6972
DOC: Update 6972
| -rw-r--r-- | numpy/lib/function_base.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index c69185c1c..9bc128f92 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -3646,11 +3646,13 @@ def trapz(y, x=None, dx=1.0, axis=-1): y : array_like Input array to integrate. x : array_like, optional - If `x` is None, then spacing between all `y` elements is `dx`. + The sample points corresponding to the `y` values. If `x` is None, + the sample points are assumed to be evenly spaced `dx` apart. The + default is None. dx : scalar, optional - If `x` is None, spacing given by `dx` is assumed. Default is 1. + The spacing between sample points when `x` is None. The default is 1. axis : int, optional - Specify the axis. + The axis along which to integrate. Returns ------- |