From 889229e9cb47c0fb16d98caeb7b4dfbe6f374577 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 16 Nov 2018 18:45:46 -0800 Subject: [PATCH] Merge pull request #128 from bsipocz/numpy_fixing_compatibility Fixing numpy compatibility --- .travis.yml | 10 +++++++--- astroML/filters.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 371c52f5..0db4799b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,11 +26,15 @@ matrix: fast_finish: true include: - - env: NUMPY_VERSION=1.11 + - env: NUMPY_VERSION=1.15 - - env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.10 + - env: NUMPY_VERSION=1.14 - - env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.9 + - env: NUMPY_VERSION=1.13 + + - env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11 + + - env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10 SCIKIT_LEARN_VERSION=0.18 - env: PYTHON_VERSION=2.7 diff --git a/astroML/filters.py b/astroML/filters.py index d95ebf98..cf02ae75 100644 --- a/astroML/filters.py +++ b/astroML/filters.py @@ -183,7 +183,7 @@ def wiener_filter(t, h, signal='gaussian', noise='flat', return_PSDs=False, # fit signal/noise params if necessary if signal_params is None: amp_guess = np.max(PSD[1:]) - width_guess = np.min(np.abs(f[PSD[1:] < np.mean(PSD[1:])])) + width_guess = np.min(np.abs(f[PSD < np.mean(PSD[1:])])) signal_params = (amp_guess, width_guess) if noise_params is None: noise_params = (np.mean(PSD[1:]),)