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
Luis Aleixo
51ce25b3b3
updated tests
2021-09-15 11:48:31 +02:00
Luis Aleixo
3407a3042a
Merge branch 'master' into feature/concentration_cumulative_dose
2021-09-15 11:44:38 +02:00
Luis Aleixo
4c3d81c953
Docstringfor exposure_between_bounds changed
2021-09-15 11:29:10 +02:00
Luis Aleixo
4388de9ed1
all times in front approach for the cumulative dose
2021-09-15 11:26:45 +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
jdevine
8fbe7856b9
Addressed comments from Andre.
2021-09-14 14:57:48 +02:00
jdevine
fdca7da53a
Changed default strain in calculator to Delta.
...
Also applies retroactively to QR codes missing delta.
The rational for the retrospective change is that old simulations (wild type)
re-run need to be re-run with the current dominant strain.
2021-09-13 13:50:12 +02:00
Philip Elson
743d4ab706
Merge branch 'feature/no_computing_before_first_time' into 'master'
...
Model optimisation: avoid computing before first presence time
See merge request cara/cara!254
2021-09-13 12:00:07 +02:00
Nicolas Mounet
9ed65a2b04
Model optimisation: avoid computing before first presence time
2021-09-13 12:00:06 +02:00
Cole Austin Coughlin
1ed67eeca1
moved most html styling to css style sheet
2021-09-08 19:59:21 -05:00
Luis Aleixo
b6ecca5a62
Merge branch 'master' into feature/concentration_cumulative_dose
2021-09-08 16:30:42 +02:00
Cole Austin Coughlin
6c5d97f514
fixed issues mentioned in merge request
2021-09-07 13:39:56 -05:00
Luis Aleixo
a689fe8e74
bug with width fixed
2021-09-07 17:06:41 +02:00
Luis Aleixo
c27f567f3a
merge with master
2021-09-07 17:00:51 +02:00
Luis Aleixo
0b83c6491e
Changed methods names and variables. New logic to calculate exposure between bounds
2021-09-07 15:30:54 +02:00
Philip Elson
97ac2ab743
Merge branch 'feature/alternative_scenario_d3' into 'master'
...
Alternative scenarios plot with D3
See merge request cara/cara!246
2021-09-07 06:43:23 +02:00
Luis Aleixo
250b7c0582
Plot alternative scenarios in report using D3.js, speeding up the response time and improving user interactivity
2021-09-07 06:43:22 +02:00
Luis Aleixo
d3e56f69b2
get boundaries from time function
2021-09-06 10:00:53 +02:00
Cole Austin Coughlin
42d7d4aea9
fixed about page
2021-09-03 12:12:53 -05:00
Cole Austin Coughlin
befa2a51f7
fixed website with new report
2021-09-03 11:42:02 -05:00
Luis Aleixo
485518f3f4
new time with breaks included
2021-09-03 09:35:57 +02:00
Philip Elson
0414e15e4b
Merge branch 'feature/masks_efficiency' into 'master'
...
Inward efficiency of masks
See merge request cara/cara!250
2021-09-02 17:15:06 +02:00
Luis Aleixo
cb334cbafa
variable renaming for the exposure and inhaled_exposure
2021-09-02 16:19:32 +02:00
Luis Aleixo
ab153ca781
added inward mask efficiency references
2021-09-02 15:23:49 +02:00
Luis Aleixo
70bde2f3fe
Merge branch 'master' into feature/concentration_cumulative_dose
2021-09-02 15:09:47 +02:00
Luis Aleixo
bdc51d81b8
Changed relevant references for mask distributions
2021-09-02 12:11:22 +02:00
Andre Henriques
72681b9895
Merge branch 'feature/climate_function' into 'master'
...
Allow location selection as part of the calculator, with temp profile from local weather station
See merge request cara/cara!211
2021-09-02 11:58:33 +02:00
