Luis Aleixo
4f63325617
Merge branch 'master' into paper/deposition_fraction
2021-09-15 10:39:10 +02:00
Luis Aleixo
9810ee3f1f
deposition_fraction_plot with correct values
2021-09-15 10:38:17 +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
Luis Aleixo
cb7d8abeb8
changed linespace range
2021-09-14 17:36:53 +02:00
Luis Aleixo
c4d43c099c
d_dep approach 1.0
2021-09-14 17:12:19 +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
Luis Aleixo
34b1f89d69
deposition fraction for a breathing model
2021-09-14 14:25:23 +02:00
Luis Aleixo
f9c92329d8
modified f_dep according to Finlay & Martin
2021-09-14 10:41:04 +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
Andrejh
0ce14e56f3
add results for shouting
2021-09-12 14:27:49 +02:00
Andrejh
9fe5ecc04f
add results for paper
2021-09-12 14:07:39 +02:00
Andrejh
6e14f8dbb6
update var naming
2021-09-10 16:48:17 +02:00
Luis Aleixo
8807942603
f_dep in function of diameter graph
2021-09-10 10:10:44 +02:00
Andrejh
2bc31d88f6
harmonize unfiform dist in data.py
2021-09-08 17:40:32 +02:00
Luis Aleixo
8c1ab2f504
Added viable_to_RNA variable to each virus in model
2021-09-08 15:46:19 +02:00
Andrejh
4dac6237c2
Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot
2021-09-08 15:40:51 +02:00
Andrejh
95cfddcdbe
add mask dependency
2021-09-08 15:40:07 +02:00
Luis Aleixo
fe00584c89
Merge branch 'feature/virions_plot' of https://gitlab.cern.ch/cara/cara into feature/virions_plot
2021-09-08 15:35:30 +02:00
Luis Aleixo
b92b2ec132
Added viable_to_RNA distribution on Virus class
2021-09-08 15:35:17 +02:00
Andrejh
eb8feb6ed4
add phy activity as and atribute
2021-09-08 15:12:25 +02:00
Luis Aleixo
902396fcf7
added values of cn_B and cn_L into the model
2021-09-08 14:33:57 +02:00
Luis Aleixo
c81e9b1c14
merge with new style
2021-09-07 16:46:41 +02:00
Luis Aleixo
e8f4db16fa
CDF models for breathing, speaking and shouting
2021-09-07 12:15:51 +02:00
Luis Aleixo
ca120716ff
Merge branch 'master' into feature/virions_plot
2021-09-07 09:59:12 +02:00
Luis Aleixo
b820b3d889
bug in print_er_info arguments
2021-09-07 09:56:42 +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
5f9091f18b
Changed colormap fontsize
2021-09-06 17:29:55 +02:00
Luis Aleixo
83caf48282
Merge branch 'feature/virions_plot' of https://gitlab.cern.ch/cara/cara into feature/virions_plot
2021-09-06 17:14:29 +02:00
Luis Aleixo
52ee8f3c38
Plot with correct legends and media values
2021-09-06 17:13:31 +02:00
Andrejh
16e705f5bb
increase sample size + add means of log(er)
2021-09-06 17:00:30 +02:00
Andrejh
ba2524a1ea
Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot
2021-09-06 15:37:20 +02:00
Andrejh
a4b1e5adf2
legend edits
2021-09-06 15:36:54 +02:00
Luis Aleixo
e152b296c8
breathing, speaking and shouting histograms all in one
2021-09-06 14:44:14 +02:00
Luis Aleixo
cca80d86ea
changed models.virus to mc.virus
2021-09-06 11:29:55 +02:00
Luis Aleixo
f0c59b0c61
added shouting model and changed talking to speaking
2021-09-06 11:04:03 +02:00
Luis Aleixo
57b6a668c0
statistical data for breathing and talking models
2021-09-06 10:42:31 +02:00
Luis Aleixo
c4afd66747
statistical data on emission rate
2021-09-06 09:37:18 +02:00
Andrejh
b00af20e82
minor edit
2021-09-03 17:18:49 +02:00
Andrejh
3ea400af2a
rearrange code in file to group talking together
2021-09-03 17:11:24 +02:00
Andrejh
38b48d3341
add tick
2021-09-03 17:10:06 +02:00
Andrejh
afb49ee1e7
Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot
2021-09-03 16:59:56 +02:00
Luis Aleixo
a4114edaf9
bug fix on label
2021-09-03 15:53:35 +02:00
Andrejh
b76152015b
Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot
...
# Conflicts:
# cara/model_scenarios.py
2021-09-03 15:50:22 +02:00
Luis Aleixo
919ba2f51e
Changed graph legend
2021-09-03 15:49:35 +02:00
