From c1938889b8bba745381624f6466276ecb0501aad Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 3 Aug 2021 16:11:59 +0200 Subject: [PATCH] test_infected_population_vectorisation and test_concentration_model_vectorisation tests fix --- cara/tests/models/test_concentration_model.py | 6 ++---- cara/tests/test_infected_population.py | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cara/tests/models/test_concentration_model.py b/cara/tests/models/test_concentration_model.py index bfbc88bb..370ec24d 100644 --- a/cara/tests/models/test_concentration_model.py +++ b/cara/tests/models/test_concentration_model.py @@ -13,7 +13,6 @@ from cara import models {'humidity': np.array([0.5, 0.4])}, {'air_change': np.array([100, 120])}, {'viral_load_in_sputum': np.array([5e8, 1e9])}, - {'infectious_dose': np.array([50, 20])}, ] ) def test_concentration_model_vectorisation(override_params): @@ -21,8 +20,7 @@ def test_concentration_model_vectorisation(override_params): 'volume': 75, 'humidity': 0.5, 'air_change': 100, - 'viral_load_in_sputum': 1e9, - 'infectious_dose': 50, + 'viral_load_in_sputum': 1e9 } defaults.update(override_params) @@ -43,7 +41,7 @@ def test_concentration_model_vectorisation(override_params): ), virus=models.SARSCoV2( viral_load_in_sputum=defaults['viral_load_in_sputum'], - infectious_dose=defaults['infectious_dose'], + infectious_dose=50., ), expiration=models.Expiration((1., 0., 0.)), ) diff --git a/cara/tests/test_infected_population.py b/cara/tests/test_infected_population.py index 3b607feb..638acfa3 100644 --- a/cara/tests/test_infected_population.py +++ b/cara/tests/test_infected_population.py @@ -7,14 +7,12 @@ import cara.models @pytest.mark.parametrize( "override_params", [ {'viral_load_in_sputum': np.array([5e8, 1e9])}, - {'infectious_dose': np.array([50, 20])}, {'exhalation_rate': np.array([0.75, 0.81])}, ] ) def test_infected_population_vectorisation(override_params): defaults = { 'viral_load_in_sputum': 1e9, - 'infectious_dose': 50, 'exhalation_rate': 0.75, } defaults.update(override_params) @@ -33,7 +31,7 @@ def test_infected_population_vectorisation(override_params): ), virus=cara.models.Virus( viral_load_in_sputum=defaults['viral_load_in_sputum'], - infectious_dose=defaults['infectious_dose'], + infectious_dose=50., ), expiration=cara.models.Expiration((1., 0., 0.)), )