diff options
| -rw-r--r-- | numpy/core/tests/test_numeric.py | 15 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py index 2f85c664e..aaa535802 100644 --- a/numpy/core/tests/test_numeric.py +++ b/numpy/core/tests/test_numeric.py @@ -724,6 +724,21 @@ class test_allclose_inf(ParametricTestCase): assert_array_equal(x,array([inf,1])) assert_array_equal(y,array([0,inf])) +class TestStdVar(NumpyTestCase): + def setUp(self): + self.A = array([1,-1,1,-1]) + self.real_var = 1 + + def test_basic(self): + assert_almost_equal(var(self.A),self.real_var) + assert_almost_equal(std(self.A)**2,self.real_var) + def test_ddof1(self): + assert_almost_equal(var(self.A,ddof=1),self.real_var*len(self.A)/float(len(self.A)-1)) + assert_almost_equal(std(self.A,ddof=1)**2,self.real_var*len(self.A)/float(len(self.A)-1)) + def test_ddof2(self): + assert_almost_equal(var(self.A,ddof=2),self.real_var*len(self.A)/float(len(self.A)-2)) + assert_almost_equal(std(self.A,ddof=2)**2,self.real_var*len(self.A)/float(len(self.A)-2)) + import sys if sys.version_info[:2] >= (2, 5): set_local_path() diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index a8f371241..9b485d253 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -1009,6 +1009,8 @@ class TestArrayMethods(NumpyTestCase): assert_equal(mXX.var(axis=3).shape,XX.var(axis=3).shape) assert_equal(mX.var().shape,X.var().shape) (mXvar0,mXvar1) = (mX.var(axis=0), mX.var(axis=1)) + assert_almost_equal(mX.var(axis=None,ddof=2),mX.compressed().var(ddof=2)) + assert_almost_equal(mX.std(axis=None,ddof=2),mX.compressed().std(ddof=2)) for k in range(6): assert_almost_equal(mXvar1[k],mX[k].compressed().var()) assert_almost_equal(mXvar0[k],mX[:,k].compressed().var()) |