From b427e5e15b34e3444192b5f44c4a69dbd1bcf584 Mon Sep 17 00:00:00 2001 From: Ian Harrison Date: Mon, 9 Sep 2024 11:04:06 +0100 Subject: [PATCH 1/3] scipy dep names fixes --- skypy/halos/mass.py | 2 +- skypy/halos/tests/test_quenching.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skypy/halos/mass.py b/skypy/halos/mass.py index fa6329534..5f5f97918 100644 --- a/skypy/halos/mass.py +++ b/skypy/halos/mass.py @@ -325,7 +325,7 @@ def _sigma_squared(M, k, Pk, growth_function, cosmology): top_hat = 3. * (np.sin(k * R) - k * R * np.cos(k * R)) / ((k * R)**3.) integrand = Pk * np.power(top_hat * k, 2) - return Dz2 * integrate.simps(integrand, k) / (2. * np.pi**2.) + return Dz2 * integrate.simpson(integrand, k) / (2. * np.pi**2.) def _dlns_dlnM(sigma, M): diff --git a/skypy/halos/tests/test_quenching.py b/skypy/halos/tests/test_quenching.py index efa0c674d..d836441c3 100644 --- a/skypy/halos/tests/test_quenching.py +++ b/skypy/halos/tests/test_quenching.py @@ -13,7 +13,7 @@ def test_environment_quenched(): quenched = environment_quenched(n, p) number_quenched = Counter(quenched)[True] - p_value = stats.binom_test(number_quenched, n=n, p=p, + p_value = stats.binomtest(number_quenched, n=n, p=p, alternative='two-sided') assert p_value > 0.01 @@ -28,6 +28,6 @@ def test_mass_quenched(): quenched = mass_quenched(halo_mass, offset, width) number_quenched = Counter(quenched)[True] - p_value = stats.binom_test(number_quenched, n=n, p=0.5, + p_value = stats.binomtest(number_quenched, n=n, p=0.5, alternative='two-sided') assert p_value > 0.01 From 4f189f69a8864291526eb4ade0e82bd57e7e81db Mon Sep 17 00:00:00 2001 From: Ian Harrison Date: Mon, 9 Sep 2024 12:22:18 +0100 Subject: [PATCH 2/3] extract pvalue for binomtest --- skypy/halos/tests/test_quenching.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skypy/halos/tests/test_quenching.py b/skypy/halos/tests/test_quenching.py index d836441c3..1809683a6 100644 --- a/skypy/halos/tests/test_quenching.py +++ b/skypy/halos/tests/test_quenching.py @@ -14,7 +14,7 @@ def test_environment_quenched(): number_quenched = Counter(quenched)[True] p_value = stats.binomtest(number_quenched, n=n, p=p, - alternative='two-sided') + alternative='two-sided').pvalue assert p_value > 0.01 @@ -29,5 +29,5 @@ def test_mass_quenched(): number_quenched = Counter(quenched)[True] p_value = stats.binomtest(number_quenched, n=n, p=0.5, - alternative='two-sided') + alternative='two-sided').pvalue assert p_value > 0.01 From 0bbd6d57a0004efe27d513c4535d8cc1247cca9f Mon Sep 17 00:00:00 2001 From: Ian Harrison Date: Mon, 9 Sep 2024 12:23:16 +0100 Subject: [PATCH 3/3] codestyle --- skypy/halos/tests/test_quenching.py | 4 ++-- skypy/power_spectrum/tests/test_growth.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/skypy/halos/tests/test_quenching.py b/skypy/halos/tests/test_quenching.py index 1809683a6..3d6c66b25 100644 --- a/skypy/halos/tests/test_quenching.py +++ b/skypy/halos/tests/test_quenching.py @@ -14,7 +14,7 @@ def test_environment_quenched(): number_quenched = Counter(quenched)[True] p_value = stats.binomtest(number_quenched, n=n, p=p, - alternative='two-sided').pvalue + alternative='two-sided').pvalue assert p_value > 0.01 @@ -29,5 +29,5 @@ def test_mass_quenched(): number_quenched = Counter(quenched)[True] p_value = stats.binomtest(number_quenched, n=n, p=0.5, - alternative='two-sided').pvalue + alternative='two-sided').pvalue assert p_value > 0.01 diff --git a/skypy/power_spectrum/tests/test_growth.py b/skypy/power_spectrum/tests/test_growth.py index efc65fc5f..53a4c6e59 100644 --- a/skypy/power_spectrum/tests/test_growth.py +++ b/skypy/power_spectrum/tests/test_growth.py @@ -57,15 +57,15 @@ def test_growth(): Dzprime = growth_function_derivative(redshift, cosmology_flat) # Test growth factor - assert redshift.shape == fz.shape,\ + assert redshift.shape == fz.shape, \ "Length of redshift array and growth rate array do not match" - assert isclose(fz[0], 1.0),\ + assert isclose(fz[0], 1.0), \ "Growth factor at redshift 0 is not close to 1.0" # Test growth function - assert redshift.shape == Dz.shape,\ + assert redshift.shape == Dz.shape, \ "Length of redshift array and growth function array do not match" - assert allclose(Dz, 1. / (1. + redshift)),\ + assert allclose(Dz, 1. / (1. + redshift)), \ "Growth function is not close to the scale factor" # make sure that growth_function with scalar returns scalar @@ -74,9 +74,9 @@ def test_growth(): assert Dz2 == Dz[2], 'growth function with scalar produced inconsistent result' # Test growth function derivative - assert redshift.shape == Dzprime.shape,\ + assert redshift.shape == Dzprime.shape, \ "Length of redshift array and growth function array do not match" - assert isclose(Dzprime[0], -1.0),\ + assert isclose(Dzprime[0], -1.0), \ "Derivative of growth function at redshift 0 is not close to -1.0" # Test against precomputed values using Planck15 cosmology