summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2006-07-18 21:10:39 +0000
committercookedm <cookedm@localhost>2006-07-18 21:10:39 +0000
commitd5a13c5e4d881a205bef6ce64cb2222aef98d43c (patch)
treeb57b99aa0d926ced857f526fd0ab0472be811da4 /numpy/core/fromnumeric.py
parentba41f2f5d864551b4462a9f53e8f23f626b11105 (diff)
downloadnumpy-d5a13c5e4d881a205bef6ce64cb2222aef98d43c.tar.gz
add some more docstrings
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index bfd8a1e0d..c3b5d031f 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -468,9 +468,17 @@ def mean(a, axis=0, dtype=None):
mean = a.mean
except AttributeError:
return _wrapit(a, 'mean', axis, dtype)
- return mean(axis, dtype)
+ return mean(axis, dtype)
def std(a, axis=0, dtype=None):
+ """std(sample, axis=0, dtype=None)
+ Return the standard deviation, a measure of the spread of a 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)).
+
+ For multidimensional arrays, std is computed by default along the first axis.
+ """
try:
std = a.std
except AttributeError: