Commit graph

1100 commits

Author SHA1 Message Date
Luis Aleixo
f3d23cf405 Merge branch 'master' into feature/concentration_cumulative_dose 2021-10-27 16:15:49 +02:00
Andre Henriques
235e244007 Merge branch 'feature/ipympl' into 'master'
Compatible ipympl version

See merge request cara/cara!276
2021-10-27 15:11:31 +02:00
Luis Aleixo
5e7d237e16 Updated ipympl compatible version 2021-10-20 14:43:03 +02:00
Luis Aleixo
f9dcbfa310 Changed ipympl version 2021-10-19 16:38:16 +02:00
Luis Aleixo
b4cdd674d5 New label, axis ticks and toolbox 2021-10-19 16:25:48 +02:00
Luis Aleixo
2dddbd1897 Removed graphs' titles 2021-10-19 13:49:08 +02:00
Luis Aleixo
719e274a54 Updated graph's legend and y axis domain 2021-10-19 11:53:12 +02:00
Andre Henriques
de41e7b57e Merge branch 'feature/website_authors' into 'master'
Moved Authors (Code contributors and Main developers) to "About" page

See merge request cara/cara!274
2021-10-18 09:23:56 +02:00
Andre Henriques
e1b72ef405 Merge branch 'feature/printable_version' into 'master'
Fix printable version

Closes #201 and #202

See merge request cara/cara!272
2021-10-18 09:16:42 +02:00
Luis Aleixo
7149bec458 Moved Authors (Code contributors and Main developers) to "About" page 2021-10-15 16:48:21 +02:00
Luis Aleixo
2d46ac0b56 Page break for disclaimer fixes #202 2021-10-13 09:21:17 +02:00
Luis Aleixo
f9a3f2bf55 Added color for the P(I) animation in the printable version fixes #201 2021-10-13 09:14:55 +02:00
Philip Elson
b182b4cf5a Merge branch 'feature/qr-clientside' into 'master'
Move QR generation to the browser, saving some time and effort on the server.

Closes #188

See merge request cara/cara!243
2021-10-06 11:59:23 +02:00
Philip Elson
86288a0ec4 Merge branch 'update/docstring_documentation' into 'master'
Update concentration docstring

See merge request cara/cara!269
2021-10-06 11:58:37 +02:00
Luis Aleixo
0840dc43ef Update concentration docstring 2021-10-06 11:58:36 +02:00
Phil Elson
fcfaee2b4a Handle the case where the URL being encoded by qrcodejs is causing an error with the library (e.g. https://github.com/davidshimjs/qrcodejs/issues/78). 2021-10-06 11:56:09 +02:00
Luis Aleixo
ea3f4abe0b Create a new QRcode for the PDF version 2021-10-06 11:56:09 +02:00
Phil Elson
dfc66991f4 Move QR generation to the browser, saving some time and effort on the server. 2021-10-06 11:56:09 +02:00
Luis Aleixo
a46e30e12d Merge branch 'master' into feature/concentration_cumulative_dose 2021-10-01 14:50:13 +02:00
Philip Elson
22109c0e04 Merge branch 'feature/ipympl_version' into 'master'
ipympl (matplotlib jupyter extension) version update

See merge request cara/cara!267
2021-10-01 14:06:35 +02:00
Luis Aleixo
480e5237c9 ipympl (Matplotlib Jupyter Extension) version 2021-09-28 09:48:26 +02:00
Luis Aleixo
4c0dae2e20 updated ipympl version 2021-09-27 12:23:28 +02:00
Luis Aleixo
38c2edd444 updated conditions for the normed_exposure_between_bounds 2021-09-27 09:24:05 +02:00
Luis Aleixo
3457e15419 Merge with master 2021-09-27 09:16:17 +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
Luis Aleixo
b6ecca5a62 Merge branch 'master' into feature/concentration_cumulative_dose 2021-09-08 16:30:42 +02: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
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