diff options
| author | pierregm <pierregm@localhost> | 2008-03-22 20:03:03 +0000 |
|---|---|---|
| committer | pierregm <pierregm@localhost> | 2008-03-22 20:03:03 +0000 |
| commit | 5cb370e9234582f62231384c26a426301dad3331 (patch) | |
| tree | 8d95cfba8219304ec211fb53f0d829468d458624 /numpy/ma/morestats.py | |
| parent | a70012ade70ba9912061ad2bac3e2a8196c72823 (diff) | |
| download | numpy-5cb370e9234582f62231384c26a426301dad3331.tar.gz | |
core : fixed sort when axis is None
mstats : fixed mmedian, renamed to median and moved to numpy.ma.extras for compatibility
extras : introduced median from mstats
mrecords: * fixed __array_finalize__ to keep the mask of a masked array when viewing it as a mrecarray
* simplified _getdata
Diffstat (limited to 'numpy/ma/morestats.py')
| -rw-r--r-- | numpy/ma/morestats.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/ma/morestats.py b/numpy/ma/morestats.py index b9e77a3c9..9816608b7 100644 --- a/numpy/ma/morestats.py +++ b/numpy/ma/morestats.py @@ -23,8 +23,8 @@ from numpy.core.numeric import concatenate import numpy.ma as MA from numpy.ma.core import masked, nomask, MaskedArray, masked_array -from numpy.ma.extras import apply_along_axis, dot -from numpy.ma.mstats import trim_both, trimmed_stde, mquantiles, mmedian, stde_median +from numpy.ma.extras import apply_along_axis, dot, median +from numpy.ma.mstats import trim_both, trimmed_stde, mquantiles, stde_median from scipy.stats.distributions import norm, beta, t, binom from scipy.stats.morestats import find_repeats @@ -328,7 +328,7 @@ Returns A (p,) array of comparison values. """ - (med_1, med_2) = (mmedian(group_1, axis=axis), mmedian(group_2, axis=axis)) + (med_1, med_2) = (median(group_1, axis=axis), median(group_2, axis=axis)) (std_1, std_2) = (stde_median(group_1, axis=axis), stde_median(group_2, axis=axis)) W = abs(med_1 - med_2) / sqrt(std_1**2 + std_2**2) |