From a0bd6c78671a63b9aa1f875bffb4937e4991bbd6 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Wed, 13 May 2015 20:31:55 -0600 Subject: MAINT: Simplify code in cov function a bit. --- numpy/lib/function_base.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'numpy/lib') diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index d2750df05..04063755c 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -2006,13 +2006,12 @@ def cov(m, y=None, rowvar=1, bias=0, ddof=None, fweights=None, aweights=None): # Determine the normalization if w is None: fact = float(X.shape[1] - ddof) + elif ddof == 0: + fact = w_sum + elif aweights is None: + fact = w_sum - ddof else: - if ddof == 0: - fact = w_sum - elif aweights is None: - fact = w_sum - ddof - else: - fact = w_sum - ddof*sum(w*aweights)/w_sum + fact = w_sum - ddof*sum(w*aweights)/w_sum if fact <= 0: warnings.warn("Degrees of freedom <= 0 for slice", RuntimeWarning) -- cgit v1.2.1