Commit graph

1091 commits

Author SHA1 Message Date
Luis Aleixo
1feec5a050 Updated test_r0 test with new value from trapezoidal integration 2021-11-08 10:36:46 +01:00
Luis Aleixo
5b639f433c Updated tests variables (transmissibility_factor, evaporation_factor and host_immunity) 2021-11-08 10:36:46 +01:00
Andre Henriques
c5ac73518a Merge branch 'feature/replace_talking' into 'feature/scientific_model_update'
Replace 'Talking' by 'Speaking' throughout the code

See merge request cara/cara!270
2021-10-27 11:02:39 +02:00
Luis Aleixo
39ccc3fc18 Replace 'Talking' by 'Speaking' throughout the code 2021-10-13 09:27:38 +02:00
Andre Henriques
a93a4a3e40 Merge branch 'feature/t_factor_update' into 'feature/scientific_model_update'
Beta VOC and transmissibility factors update

See merge request cara/cara!265
2021-10-12 18:20:39 +02:00
Luis Aleixo
8f601ef37c Bug on Betta VOC 2021-10-12 16:49:18 +02:00
Luis Aleixo
73b36b81db Changed PANGO names to greek letters 2021-10-12 09:55:44 +02:00
Luis Aleixo
fe404bb374 Update VOCs references 2021-10-07 15:19:55 +02:00
Luis Aleixo
7a4e64c9b6 Added Beta VOC 2021-10-07 12:11:18 +02:00
Luis Aleixo
1eb9d85b24 Changed transmissibility_factor for each virus 2021-10-07 12:11:18 +02:00
Andre Henriques
2f7877ce20 Merge branch 'feature/scientific_model_update_ipympl_version' into 'feature/scientific_model_update'
ipympl (matplotlib jupyter extension) version update

See merge request cara/cara!271
2021-10-07 09:21:03 +02:00
Luis Aleixo
13bc06640a Changed ipympl package version 2021-10-07 09:15:15 +02:00
Andre Henriques
4e0e8f6392 Merge branch 'feature/diameter_dependent_dynamics_and_deposition' into 'feature/scientific_model_update'
Model upgraded into fully diameter-dependent model

See merge request cara/cara!263
2021-09-22 15:34:41 +02:00
Nicolas Mounet
de0b0b4b10 Adding diameter dependence of deposition factor 2021-09-22 15:15:21 +02:00
Nicolas Mounet
4c33766e59 Adding diameter dependence of settling velocity from gravitation 2021-09-22 11:51:39 +02:00
Nicolas Mounet
dde63fd623 Adding exposed population host immunity to integration tests from test_monte_carlo_full_models.py 2021-09-22 11:51:09 +02:00
Nicolas Mounet
c2f2ca1bf6 Merge branch 'feature/BLO_data' into 'feature/scientific_model_update'
BLO particle concentration emission value update

See merge request cara/cara!253
2021-09-22 09:06:50 +02:00
Nicolas Mounet
cbb17e4950 Updating test_expiration_aerosols 2021-09-22 08:55:39 +02:00
Luis Aleixo
66ebf8a2bb Correct Cn values for B and L factors 2021-09-21 17:16:01 +02:00
Nicolas Mounet
c5a849f653 Merge branch 'feature/probability_infection' into 'feature/scientific_model_update'
Changed probability of infection formula

See merge request cara/cara!262
2021-09-21 12:05:02 +02:00
Luis Aleixo
364f20930e Changed P(I) formula and added host immunity for exposed Population
Fixed values for viable_to_RNA_ratio and transmissibility_factor of each Virus variant

Updated probability of infection formula
2021-09-21 11:49:22 +02:00
Luis Aleixo
e00d7982a8 Added a uniform distribution for the infectious dose 2021-09-21 11:46:04 +02:00
Andre Henriques
414b133856 Merge branch 'feature/infectious_dose_dist' into 'feature/scientific_model_update'
Infectious dose with uniform distribution

See merge request cara/cara!261
2021-09-20 16:23:12 +02:00
Luis Aleixo
35ea838933 Added a uniform distribution for the infectious dose 2021-09-20 16:15:46 +02:00
Nicolas Mounet
38a8870535 Merge branch 'feature/infectious_virus_fraction' into 'feature/scientific_model_update'
Updated inhaled dose with Infectious virus fraction

See merge request cara/cara!260
2021-09-20 14:26:03 +02:00
Luis Aleixo
e2327ee82d Deactivate pipeline 2021-09-20 14:20:51 +02:00
Luis Aleixo
0929bfc0b0 Changed the f_inf calculation to the InfectedPopulation class 2021-09-20 12:12:31 +02:00
Luis Aleixo
153896ec7e Updated host immunity declaration to model generator 2021-09-20 12:12:31 +02:00
Luis Aleixo
61be4a57f5 Updated infected probability with f_inf that considers the host immunity and the viable-to-RNA distribution 2021-09-17 14:46:45 +02:00
Andre Henriques
86ab306dd9 Merge branch 'feature/diameter_dependence' into 'feature/scientific_model_update'
Monte-Carlo sampling of the aerosol diameters with BLO model

See merge request cara/cara!259
2021-09-17 12:11:18 +02:00
Nicolas Mounet
396339f7bb Modifying condition to trigger the averaging of the exposure in cara/models.py 2021-09-17 09:34:00 +02:00
Nicolas Mounet
84fcddcd86 Preventing MultipleExpiration to be used with distributions 2021-09-17 09:34:00 +02:00
Nicolas Mounet
efe35da414 Taking the mean of the exposure only when diameter is an array (represents a distribution) 2021-09-16 18:15:25 +02:00
Nicolas Mounet
30eb90099b Introducing cn as parameter for the Expiration, and proper normalization of the exposure 2021-09-16 18:15:25 +02:00
Nicolas Mounet
acdd22cb07 Bugs fixed in monte_carlo/data.py; updating ExposureModel for diameter dependent exposure 2021-09-16 18:15:25 +02:00
Nicolas Mounet
28a9e5d5b3 Adding expiration diameter distributions from the BLO model 2021-09-16 18:15:25 +02:00
Nicolas Mounet
7d3a83c629 Removing completely the previous BLO implementation for Expiration; tests updated accordingly 2021-09-16 18:09:35 +02:00
Nicolas Mounet
ab90b04349 Introducing diameter as a vectorised parameter of Expiration. Providing equivalent diameters for each expiration type (gives the same emission rate as before) 2021-09-16 17:48:49 +02:00
Nicolas Mounet
936c72f76c Adding optional total concentration parameter in Expiration 2021-09-16 17:22:32 +02:00
Nicolas Mounet
ca6e70f2f9 Removing completely the previous BLO implementation for Expiration; tests updated accordingly 2021-09-16 16:33:31 +02:00
Nicolas Mounet
85f0f1708e Removing infectious dose in emission rate when using known_individual_emission_rate 2021-09-16 16:33:31 +02:00
Nicolas Mounet
d1ec990255 Remove suprespreading event from the expiration types; replace by an optional parameter to fix directly the emission rate; updates the corresponding tests 2021-09-16 16:33:31 +02:00
Nicolas Mounet
46465c499d Vectorising the Mask exhale_efficiency method 2021-09-16 16:33:30 +02:00
Nicolas Mounet
83e2185763 Introducing diameter as a vectorised parameter of Expiration. Providing equivalent diameters for each expiration type (gives the same emission rate as before) 2021-09-16 14:41:06 +02:00
Andre Henriques
686c709cc9 Merge branch 'feature/remove_superspreading' into 'master'
Remove suprespreading event from the expiration types

See merge request cara/cara!256
2021-09-16 13:55:05 +02:00
Nicolas Mounet
af3ded7935 Remove suprespreading event from the expiration types 2021-09-16 13:55:04 +02:00
Andre Henriques
092d566dbe Merge branch 'feature/delta_default' into 'master'
Changes default strain in calculator to Delta.

See merge request cara/cara!257
2021-09-14 23:51:49 +02:00
jdevine
5d4dc4b91d reverted model_generator default virus type 2021-09-14 16:22:49 +02:00
Andre Henriques
705485b1d5 Merge branch 'feature/concentration_normalization' into 'master'
Normalization of the computation of the concentration

See merge request cara/cara!255
2021-09-14 16:11:45 +02:00
Nicolas Mounet
92f9bce7e5 Normalization of the computation of the concentration 2021-09-14 16:11:44 +02:00