From fee2bcab8610edbdd41485cf4c67e305afbd9b6a Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 3 Feb 2022 10:54:44 +0100 Subject: [PATCH] Changed test values on test_known_quantities --- cara/tests/test_known_quantities.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cara/tests/test_known_quantities.py b/cara/tests/test_known_quantities.py index 6aca5e70..2ab80fc8 100644 --- a/cara/tests/test_known_quantities.py +++ b/cara/tests/test_known_quantities.py @@ -381,16 +381,16 @@ def build_exposure_model(concentration_model): ) -# expected exposure were computed with a trapezoidal integration, using +# expected deposited exposure were computed with a trapezoidal integration, using # a mesh of 100'000 pts per exposed presence interval. @pytest.mark.parametrize( - "month, expected_exposure", + "month, expected_deposited_exposure", [ - ['Jan', 503.254087759], - ['Jun', 2294.71115639], + ['Jan', 377.440565819], + ['Jun', 1721.03336729], ], ) -def test_exposure_hourly_dep(month,expected_exposure): +def test_exposure_hourly_dep(month,expected_deposited_exposure): m = build_exposure_model( build_hourly_dependent_model( month, @@ -398,20 +398,20 @@ def test_exposure_hourly_dep(month,expected_exposure): intervals_presence_infected=((8., 12.), (13., 17.)) ) ) - exposure = m.exposure() - npt.assert_allclose(exposure, expected_exposure) + deposited_exposure = m.deposited_exposure() + npt.assert_allclose(deposited_exposure, expected_deposited_exposure) -# expected exposure were computed with a trapezoidal integration, using +# expected deposited exposure were computed with a trapezoidal integration, using # a mesh of 100'000 pts per exposed presence interval and 25 pts per hour # for the temperature discretization. @pytest.mark.parametrize( - "month, expected_exposure", + "month, expected_deposited_exposure", [ - ['Jan', 511.118941481], - ['Jun', 2398.90129579], + ['Jan', 383.339206111], + ['Jun', 1799.17597184], ], ) -def test_exposure_hourly_dep_refined(month,expected_exposure): +def test_exposure_hourly_dep_refined(month,expected_deposited_exposure): m = build_exposure_model( build_hourly_dependent_model( month, @@ -420,5 +420,5 @@ def test_exposure_hourly_dep_refined(month,expected_exposure): temperatures=data.GenevaTemperatures, ) ) - exposure = m.exposure() - npt.assert_allclose(exposure, expected_exposure, rtol=0.02) + deposited_exposure = m.deposited_exposure() + npt.assert_allclose(deposited_exposure, expected_deposited_exposure, rtol=0.02)