diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-06-21 10:28:41 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-08-12 22:33:55 -0600 |
| commit | 1b6b8719735ca3e98a0a0c3f492f16ff00ba1aa9 (patch) | |
| tree | 1042eabf7cc7335c3813a5bdc537b79924f31bbd /numpy/core/fromnumeric.py | |
| parent | fcb0fef5c673ed0a5442b18bcd8c391907b4f9a7 (diff) | |
| download | numpy-1b6b8719735ca3e98a0a0c3f492f16ff00ba1aa9.tar.gz | |
MAINT: Clean up core/_methods.py and core/fromnumeric.py
Use issubclass instead of issubdtype.
Add some blank lines.
Remove trailing whitespace.
Remove uneeded float casts since true_divide is default.
Clean up documentation a bit.
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 35d36d960..e325c5fd1 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -62,9 +62,9 @@ def take(a, indices, axis=None, out=None, mode='raise'): The source array. indices : array_like The indices of the values to extract. - + .. versionadded:: 1.8.0 - + Also allow scalars for indices. axis : int, optional The axis over which to select values. By default, the flattened @@ -2664,8 +2664,7 @@ def mean(a, axis=None, dtype=None, out=None, keepdims=False): See Also -------- average : Weighted average - nanmean : Arithmetic mean while ignoring NaNs - var, nanvar + std, var, nanmean, nanstd, nanvar Notes ----- @@ -2752,8 +2751,7 @@ def std(a, axis=None, dtype=None, out=None, ddof=0, keepdims=False): See Also -------- - var, mean - nanmean, nanstd + var, mean, nanmean, nanstd, nanvar numpy.doc.ufuncs : Section "Output arguments" Notes @@ -2856,8 +2854,7 @@ def var(a, axis=None, dtype=None, out=None, ddof=0, See Also -------- - std : Standard deviation - mean : Average + std , mean, nanmean, nanstd, nanvar numpy.doc.ufuncs : Section "Output arguments" Notes |