summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-29 10:28:11 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-29 10:28:11 +0000
commit775a47de7e2f4b039592d614e7ac3fda464975a8 (patch)
tree6ec0d74f0505ba0e60f3ee01af70b4669ec38475 /numpy/add_newdocs.py
parentce7a968a7b5cdb328ca1ea222211ad9cd8e506ad (diff)
downloadnumpy-775a47de7e2f4b039592d614e7ac3fda464975a8.tar.gz
Add axis arguments to various functions so as not to rely on the defaults.
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index ea8915af3..c91e8482c 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -657,7 +657,7 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('mean',
is given, this equals:
a.sum(axis, dtype) * 1.0 / len(a).
If axis is None, this equals:
- a.sum(axis, dtype) * 1.0 / product(a.shape)
+ a.sum(axis, dtype) * 1.0 / product(a.shape,axis=0)
The optional dtype argument is the data type for intermediate
calculations in the sum.;
@@ -834,7 +834,7 @@ distribution.
The standard deviation is the square root of the average of the
squared deviations from the mean, i.e.
- std = sqrt(mean((x - x.mean())**2)).
+ std = sqrt(mean((x - x.mean())**2,axis=0)).
For multidimensional arrays, std is computed by default along the
first axis.
@@ -853,7 +853,7 @@ value and intermediate calculations. The default is to upcast
(promote) smaller integer types to the platform-dependent int.
For example, on 32-bit platforms:
- a.dtype default sum() dtype
+ a.dtype default sum dtype
---------------------------------------------------
bool, int8, int16, int32 int32