diff options
| author | Stefan van der Walt <stefan@sun.ac.za> | 2008-04-03 07:06:46 +0000 |
|---|---|---|
| committer | Stefan van der Walt <stefan@sun.ac.za> | 2008-04-03 07:06:46 +0000 |
| commit | 5fc40c054140b8f43eb2838f892367ca05bcf302 (patch) | |
| tree | 8e9e0a88798774caa009dcce160c3e2cb816a82a /numpy/core/fromnumeric.py | |
| parent | 07628857fab36890bd2755ed52785f3493d64bb8 (diff) | |
| download | numpy-5fc40c054140b8f43eb2838f892367ca05bcf302.tar.gz | |
Fix mean docstring.
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 23e2a3229..da169d017 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1578,7 +1578,7 @@ def mean(a, axis=None, dtype=None, out=None): Returns the average of the array elements. The average is taken over the flattened array by default, otherwise over the specified - axis. The dtype returned for integer type arrays is float + axis. The dtype returned for integer type arrays is float. Parameters ---------- @@ -1587,9 +1587,9 @@ def mean(a, axis=None, dtype=None, out=None): array, a conversion is attempted. axis : {None, integer}, optional Axis along which the means are computed. The default is to compute - the standard deviation of the flattened array. + the mean of the flattened array. dtype : {None, dtype}, optional - Type to use in computing the means. For arrays of integer type the + Type to use in computing the mean. For arrays of integer type the default is float32, for arrays of float types it is the same as the array type. out : {None, array}, optional @@ -1605,8 +1605,7 @@ def mean(a, axis=None, dtype=None, out=None): See Also -------- - var : Variance - std : Standard deviation + average : Weighted average Notes ----- |