diff options
| author | Jaime <jaime.frio@gmail.com> | 2015-05-13 19:51:32 -0700 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2015-05-13 19:51:32 -0700 |
| commit | 0174f2ae5d9efc7d7459c20c99e31ace20a341ed (patch) | |
| tree | 2b70bd4c86d2e33df20c55f01fbb86291ca4d714 | |
| parent | 9ceb5cdd6a7bd0c3402a7cd04a549adea9d7be41 (diff) | |
| parent | a0bd6c78671a63b9aa1f875bffb4937e4991bbd6 (diff) | |
| download | numpy-0174f2ae5d9efc7d7459c20c99e31ace20a341ed.tar.gz | |
Merge pull request #5873 from charris/style-fix-for-cov
MAINT: Simplify code in cov function a bit.
| -rw-r--r-- | numpy/lib/function_base.py | 11 |
1 files changed, 5 insertions, 6 deletions
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) |