pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding breathing rate factor in short-range deposited exposure (bug fix); more samples in Monte-Carlo general tests

Browse source
This commit is contained in:
Nicolas Mounet 2022-04-05 19:42:22 +02:00
parent 99e57da469
commit ac92c99098
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cara/models.py
View file

@ -1318,14 +1318,20 @@ class ExposureModel:
# in the case of a single diameter or no diameter defined,
# one should not take any mean at this stage.
deposited_exposure += short_range_exposure*fdep
# then we multiply by the diameter-independent quantity virus viral load
deposited_exposure *= self.concentration_model.virus.viral_load_in_sputum
# long-range concentration
f_inf = self.concentration_model.infected.fraction_of_infectious_virus()
deposited_exposure += self.long_range_deposited_exposure_between_bounds(time1, time2)/f_inf
return deposited_exposure * f_inf
# multiply by the (diameter-independent) inhalation rate
deposited_exposure *= interaction.activity.inhalation_rate
# then we multiply by diameter-independent quantities: viral load
# and fraction of infected virions
f_inf = self.concentration_model.infected.fraction_of_infectious_virus()
deposited_exposure *= (f_inf
* self.concentration_model.virus.viral_load_in_sputum
)
# long-range concentration
deposited_exposure += self.long_range_deposited_exposure_between_bounds(time1, time2)
return deposited_exposure
def deposited_exposure(self) -> _VectorisedFloat:
"""

2
cara/tests/test_monte_carlo_full_models.py
View file

@ -9,7 +9,7 @@ from cara.apps.calculator.model_generator import build_expiration
# TODO: seed better the random number generators
np.random.seed(2000)
SAMPLE_SIZE = 250_000
SAMPLE_SIZE = 600_000
TOLERANCE = 0.06
# Load the weather data (temperature in kelvin) for Toronto.