[Scipy-svn] r5161 - in trunk/scipy/stats: . tests
scipy-svn at scipy.org
scipy-svn at scipy.org
Sat Nov 22 00:41:10 EST 2008
Author: josef
Date: 2008-11-21 23:41:08 -0600 (Fri, 21 Nov 2008)
New Revision: 5161
Modified:
trunk/scipy/stats/__init__.py
trunk/scipy/stats/mstats_basic.py
trunk/scipy/stats/mstats_extras.py
trunk/scipy/stats/tests/test_mstats_extras.py
Log:
add mstats to stats.__all__, correct imports
Modified: trunk/scipy/stats/__init__.py
===================================================================
--- trunk/scipy/stats/__init__.py 2008-11-22 05:26:45 UTC (rev 5160)
+++ trunk/scipy/stats/__init__.py 2008-11-22 05:41:08 UTC (rev 5161)
@@ -9,6 +9,7 @@
from rv import *
from morestats import *
from kde import gaussian_kde
+import mstats
__all__ = filter(lambda s:not s.startswith('_'),dir())
from numpy.testing import Tester
Modified: trunk/scipy/stats/mstats_basic.py
===================================================================
--- trunk/scipy/stats/mstats_basic.py 2008-11-22 05:26:45 UTC (rev 5160)
+++ trunk/scipy/stats/mstats_basic.py 2008-11-22 05:41:08 UTC (rev 5161)
@@ -13,6 +13,7 @@
__all__ = ['argstoarray',
'betai',
+ 'cov', # from np.ma
'chisquare','count_tied_groups',
'describe',
'f_oneway','f_value_wilks_lambda','find_repeats','friedmanchisquare',
@@ -47,12 +48,13 @@
import warnings
-import scipy.stats as stats
+#import scipy.stats as stats
+import stats
import scipy.special as special
import scipy.misc as misc
-import scipy.stats.futil as futil
+#import scipy.stats.futil as futil
+import futil
-
genmissingvaldoc = """
Notes
-----
Modified: trunk/scipy/stats/mstats_extras.py
===================================================================
--- trunk/scipy/stats/mstats_extras.py 2008-11-22 05:26:45 UTC (rev 5160)
+++ trunk/scipy/stats/mstats_extras.py 2008-11-22 05:41:08 UTC (rev 5161)
@@ -10,7 +10,7 @@
__docformat__ = "restructuredtext en"
-__all__ = ['compare_median_ms',
+__all__ = ['compare_medians_ms',
'hdquantiles', 'hdmedian', 'hdquantiles_sd',
'idealfourths',
'median_cihs','mjci','mquantiles_cimj',
@@ -23,7 +23,7 @@
import numpy.ma as ma
from numpy.ma import MaskedArray
-import scipy.stats.mstats as mstats
+import mstats_basic as mstats
from scipy.stats.distributions import norm, beta, t, binom
Modified: trunk/scipy/stats/tests/test_mstats_extras.py
===================================================================
--- trunk/scipy/stats/tests/test_mstats_extras.py 2008-11-22 05:26:45 UTC (rev 5160)
+++ trunk/scipy/stats/tests/test_mstats_extras.py 2008-11-22 05:41:08 UTC (rev 5161)
@@ -11,7 +11,7 @@
import numpy.ma as ma
import scipy.stats.mstats as ms
-import scipy.stats.mmorestats as mms
+#import scipy.stats.mmorestats as mms
from numpy.testing import *
@@ -25,29 +25,29 @@
"Tests the Marits-Jarrett estimator"
data = ma.array([ 77, 87, 88,114,151,210,219,246,253,262,
296,299,306,376,428,515,666,1310,2611])
- assert_almost_equal(mms.mjci(data),[55.76819,45.84028,198.87875],5)
+ assert_almost_equal(ms.mjci(data),[55.76819,45.84028,198.87875],5)
#
def test_trimmedmeanci(self):
"Tests the confidence intervals of the trimmed mean."
data = ma.array([545,555,558,572,575,576,578,580,
594,605,635,651,653,661,666])
assert_almost_equal(ms.trimmed_mean(data,0.2), 596.2, 1)
- assert_equal(np.round(mms.trimmed_mean_ci(data,(0.2,0.2)),1),
+ assert_equal(np.round(ms.trimmed_mean_ci(data,(0.2,0.2)),1),
[561.8, 630.6])
#
def test_idealfourths(self):
"Tests ideal-fourths"
test = np.arange(100)
- assert_almost_equal(np.asarray(mms.idealfourths(test)),
+ assert_almost_equal(np.asarray(ms.idealfourths(test)),
[24.416667,74.583333],6)
test_2D = test.repeat(3).reshape(-1,3)
- assert_almost_equal(mms.idealfourths(test_2D, axis=0),
+ assert_almost_equal(ms.idealfourths(test_2D, axis=0),
[[24.416667,24.416667,24.416667],
[74.583333,74.583333,74.583333]],6)
- assert_almost_equal(mms.idealfourths(test_2D, axis=1),
+ assert_almost_equal(ms.idealfourths(test_2D, axis=1),
test.repeat(2).reshape(-1,2))
test = [0,0]
- _result = mms.idealfourths(test)
+ _result = ms.idealfourths(test)
assert(np.isnan(_result).all())
#..............................................................................
@@ -78,22 +78,22 @@
0.827928620,0.480283781,0.594514455,0.213641488,0.024194386,
0.536668589,0.699497811,0.892804071,0.093835427,0.731107772]
#
- assert_almost_equal(mms.hdquantiles(data,[0., 1.]),
+ assert_almost_equal(ms.hdquantiles(data,[0., 1.]),
[0.006514031, 0.995309248])
- hdq = mms.hdquantiles(data,[0.25, 0.5, 0.75])
+ hdq = ms.hdquantiles(data,[0.25, 0.5, 0.75])
assert_almost_equal(hdq, [0.253210762, 0.512847491, 0.762232442,])
- hdq = mms.hdquantiles_sd(data,[0.25, 0.5, 0.75])
+ hdq = ms.hdquantiles_sd(data,[0.25, 0.5, 0.75])
assert_almost_equal(hdq, [0.03786954, 0.03805389, 0.03800152,], 4)
#
data = np.array(data).reshape(10,10)
- hdq = mms.hdquantiles(data,[0.25,0.5,0.75],axis=0)
- assert_almost_equal(hdq[:,0], mms.hdquantiles(data[:,0],[0.25,0.5,0.75]))
- assert_almost_equal(hdq[:,-1], mms.hdquantiles(data[:,-1],[0.25,0.5,0.75]))
- hdq = mms.hdquantiles(data,[0.25,0.5,0.75],axis=0,var=True)
+ hdq = ms.hdquantiles(data,[0.25,0.5,0.75],axis=0)
+ assert_almost_equal(hdq[:,0], ms.hdquantiles(data[:,0],[0.25,0.5,0.75]))
+ assert_almost_equal(hdq[:,-1], ms.hdquantiles(data[:,-1],[0.25,0.5,0.75]))
+ hdq = ms.hdquantiles(data,[0.25,0.5,0.75],axis=0,var=True)
assert_almost_equal(hdq[...,0],
- mms.hdquantiles(data[:,0],[0.25,0.5,0.75],var=True))
+ ms.hdquantiles(data[:,0],[0.25,0.5,0.75],var=True))
assert_almost_equal(hdq[...,-1],
- mms.hdquantiles(data[:,-1],[0.25,0.5,0.75], var=True))
+ ms.hdquantiles(data[:,-1],[0.25,0.5,0.75], var=True))
###############################################################################
More information about the Scipy-svn
mailing list