test_infected_population_vectorisation and test_concentration_model_vectorisation tests fix

This commit is contained in:
Luis Aleixo 2021-08-03 16:11:59 +02:00
parent 9a43db9c5a
commit c1938889b8
2 changed files with 3 additions and 7 deletions

View file

@ -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.)),
)

View file

@ -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.)),
)