diff options
author | Julian Taylor <juliantaylor108@gmail.com> | 2014-05-30 20:32:49 +0200 |
---|---|---|
committer | Julian Taylor <juliantaylor108@gmail.com> | 2014-05-30 20:32:49 +0200 |
commit | a3fda96c7f25699584ac2cfa3617372db808e67f (patch) | |
tree | f94b0aa4df10b6c630c8a05a60b72066184d4280 /numpy/lib/function_base.py | |
parent | db10b93f5e5e12a281a63c98af3f845ac18528bf (diff) | |
parent | d41fc7a2dc931aa0c399b7fcaa663e48e54e4fcf (diff) | |
download | numpy-a3fda96c7f25699584ac2cfa3617372db808e67f.tar.gz |
Merge pull request #4761 from dfreese/maint/keepdimsincov
MAINT: Removed code emulating keepdims in cov
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r-- | numpy/lib/function_base.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 9a4c47289..6bdbce9d7 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -21,7 +21,7 @@ from numpy.core import linspace, atleast_1d, atleast_2d from numpy.core.numeric import ( ones, zeros, arange, concatenate, array, asarray, asanyarray, empty, empty_like, ndarray, around, floor, ceil, take, ScalarType, dot, where, - newaxis, intp, integer, isscalar + intp, integer, isscalar ) from numpy.core.umath import ( pi, multiply, add, arctan2, frompyfunc, cos, less_equal, sqrt, sin, @@ -1863,11 +1863,9 @@ def cov(m, y=None, rowvar=1, bias=0, ddof=None): if rowvar: N = X.shape[1] axis = 0 - tup = (slice(None), newaxis) else: N = X.shape[0] axis = 1 - tup = (newaxis, slice(None)) # check ddof if ddof is None: @@ -1884,7 +1882,7 @@ def cov(m, y=None, rowvar=1, bias=0, ddof=None): y = array(y, copy=False, ndmin=2, dtype=dtype) X = concatenate((X, y), axis) - X -= X.mean(axis=1-axis)[tup] + X -= X.mean(axis=1-axis, keepdims=True) if not rowvar: return (dot(X.T, X.conj()) / fact).squeeze() else: |