diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 10:28:11 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-08-29 10:28:11 +0000 |
| commit | 775a47de7e2f4b039592d614e7ac3fda464975a8 (patch) | |
| tree | 6ec0d74f0505ba0e60f3ee01af70b4669ec38475 /numpy/core/ma.py | |
| parent | ce7a968a7b5cdb328ca1ea222211ad9cd8e506ad (diff) | |
| download | numpy-775a47de7e2f4b039592d614e7ac3fda464975a8.tar.gz | |
Add axis arguments to various functions so as not to rely on the defaults.
Diffstat (limited to 'numpy/core/ma.py')
| -rw-r--r-- | numpy/core/ma.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/ma.py b/numpy/core/ma.py index 2e2d3f8ec..67335019f 100644 --- a/numpy/core/ma.py +++ b/numpy/core/ma.py @@ -1613,7 +1613,7 @@ def average (a, axis=None, weights=None, returned = 0): If axis is None, average over the entire array Inputs can be integer or floating types; result is of type float. - If weights are given, result is sum(a*weights)/(sum(weights)*1.0) + If weights are given, result is sum(a*weights,axis=0)/(sum(weights,axis=0)*1.0) weights must have a's shape or be the 1-d with length the size of a in the given axis. |