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

added new model input

Browse source
This commit is contained in:
Luis Aleixo 2024-05-07 15:16:29 +02:00
parent 3327b6e461
commit e97a4cc805
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
caimira/models.py
View file

@ -1331,6 +1331,9 @@ class ShortRangeModel:
#: Interpersonal distances
distance: _VectorisedFloat
#: Total people with short-range interactions
total_people: int = 1
def dilution_factor(self) -> _VectorisedFloat:
'''
The dilution factor for the respective expiratory activity type.
@ -1816,10 +1819,16 @@ class ExposureModel:
"""
The expect_new_cases should always take the long-range infection_probability and multiply by the occupants exposed to long-range.
"""
prob_inf: _VectorisedFloat = self.infection_probability()
if self.short_range != ():
return nested_replace(self, {'short_range': ()}).infection_probability() * self.exposed.number / 100
# If short-range interaction are defined, the total expected number of new cases
# has to take into account both the long- and short-range probability of infection.
long_range_model = nested_replace(self, {'short_range': (),})
long_range_prob = long_range_model.infection_probability()
short_range_total_people = self.short_range[0].total_people
return (prob_inf * short_range_total_people + long_range_prob * self.exposed.number) / 100
return self.infection_probability() * self.exposed.number / 100
return prob_inf * self.exposed.number / 100
def reproduction_number(self) -> _VectorisedFloat:
"""