diff options
| author | Mary <sleeplessinseattle.dev@gmail.com> | 2021-02-17 19:48:22 -0800 |
|---|---|---|
| committer | Mary <sleeplessinseattle.dev@gmail.com> | 2021-02-17 19:48:22 -0800 |
| commit | c902caf7c66bf0657ce8ae0987f72adbaadebd22 (patch) | |
| tree | c2b888a8428d5458429d5b9a540cfb427904dda5 /numpy/lib/function_base.py | |
| parent | dca0d1c928665464b137419f0f530d5a6aac8ebd (diff) | |
| parent | 0eb9f54e5e466c8d7a76ae116712b368d045c7e0 (diff) | |
| download | numpy-c902caf7c66bf0657ce8ae0987f72adbaadebd22.tar.gz | |
Merge branch 'master' of https://github.com/numpy/numpy into iss17845p3a
Diffstat (limited to 'numpy/lib/function_base.py')
| -rw-r--r-- | numpy/lib/function_base.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 276ffa5d4..d33a0fa7d 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -4100,9 +4100,12 @@ def trapz(y, x=None, dx=1.0, axis=-1): Returns ------- - trapz : float - Definite integral as approximated by trapezoidal rule. - + trapz : float or ndarray + Definite integral of 'y' = n-dimensional array as approximated along + a single axis by the trapezoidal rule. If 'y' is a 1-dimensional array, + then the result is a float. If 'n' is greater than 1, then the result + is an 'n-1' dimensional array. + See Also -------- sum, cumsum @@ -4245,7 +4248,7 @@ def meshgrid(*xi, copy=True, sparse=False, indexing='xy'): See Also -------- mgrid : Construct a multi-dimensional "meshgrid" using indexing notation. - ogrid : Construct an open multi-dimensional "meshgrid" using indexing + ogrid : Construct an open multi-dimensional "meshgrid" using indexing notation. Examples |