Commit graph

884 commits

Author SHA1 Message Date
Phil Elson
0ead3be0b1 Distribute the work of calculating alternative scenario statistics. 2021-07-12 09:54:59 +02:00
Phil Elson
4d3ff3c742 Remove the repeats concept from the report generator (removed in 1d34db3a81). 2021-07-12 09:54:59 +02:00
Nicola Tarocco
1044946fa5 Merge branch 'feature/non-blocking-report' into 'master'
Avoid blocking the application when computing the calculator report

See merge request cara/cara!214
2021-07-08 14:50:48 +00:00
Phil Elson
0e52b38eb3 Avoid blocking the application when computing the calculator report. 2021-07-08 15:24:33 +02:00
Philip James Elson
c8362104c9 Merge branch 'maint/code-refinement' into 'master'
Re-enable mypy CI after turning it off in an emergency

See merge request cara/cara!210
2021-07-08 06:53:53 +00:00
Gabriella Azzopardi
76c0416c1e Merge branch 'update/infected_people' into 'master'
Add default in UI for infected people

See merge request cara/cara!206
2021-07-07 15:20:18 +00:00
Andre Henriques
ab0eb5e3d8 back-to-No-Default 2021-07-07 14:58:18 +00:00
Phil Elson
83ec4831b5 Re-enable mypy CI after turning it off in an emergency in https://gitlab.cern.ch/cara/cara/-/merge_requests/196. 2021-07-07 16:03:16 +02:00
Gaby Azzopardi
e10ee7083d Update infected default 2021-07-07 15:51:39 +02:00
Philip James Elson
1fca4d24b7 Merge branch 'bugfixes/terminal-error-tuple' into 'master'
Bugfixes/terminal error tuple

Closes #171

See merge request cara/cara!205
2021-07-07 10:55:06 +00:00
Luis Aleixo
b3316cea83 Bugfixes/terminal error tuple 2021-07-07 10:55:06 +00:00
Andre Henriques
521de96b72 Merge branch 'feature/docker-on-master' into 'master'
Only build (and upload) the docker image if we are on master.

See merge request cara/cara!208
2021-07-07 09:13:10 +00:00
Phil Elson
f33f2a4cbc Only build (and upload) the docker image if we are on master. 2021-07-07 11:09:12 +02:00
Andre Henriques
d4225a9d4f Merge branch 'fix/ci' into 'master'
Pin the CI to python 3.6

See merge request cara/cara!207
2021-07-07 09:08:22 +00:00
Phil Elson
910f1f53d4 Pin the CI to python 3.6 2021-07-07 10:48:26 +02:00
Andre Henriques
008daf8812 Merge branch 'develop/fix_affiliation' into 'master'
Fix affiliation  of Markus

See merge request cara/cara!204
2021-06-29 07:53:12 +00:00
Nicolas Mounet
71a788638b Adding (NTNU) to Markus' affiliation 2021-06-29 09:32:26 +02:00
Nicolas Mounet
b2b5361533 Fix Markus Rognlien affiliation in html 2021-06-28 17:30:42 +02:00
Andre Henriques
a9b68dec0a Merge branch 'Indian_variant' into 'master'
Add new virus type (indian variant)

See merge request cara/cara!202
2021-06-25 09:10:06 +00:00
Andre Henriques
3f89657355 Add new virus type (indian variant) 2021-06-25 09:10:04 +00:00
Philip James Elson
699b9322ea Merge branch 'fix-trigger-build' into 'master'
remove wrong BuildConfig trigger on OpenShift

See merge request cara/cara!200
2021-06-23 07:34:15 +00:00
Nicola Tarocco
5af0f39229 remove wrong BuildConfig trigger on OpenShift 2021-06-15 18:29:42 +02:00
Andre Henriques
d36203f703 Merge branch 'make-calculator-customizable' into 'master'
calculator: make URL path customizable

See merge request cara/cara!199
2021-06-15 16:15:35 +00:00
Nicola Tarocco
7ad06238dd calculator: make URL path customizable 2021-06-15 14:53:34 +02:00
Philip James Elson
b1b5826a38 Merge branch 'fix/mypy-update' into 'master'
Include the new types packages for types that we depend upon

See merge request cara/cara!196
2021-06-10 15:35:49 +00:00
Phil Elson
07e5eb9d18 Disable entirely the type checker for now. 2021-06-10 17:31:02 +02:00
Phil Elson
1c35c89e8a Include the new types packages for types that we depend upon. 2021-06-10 17:26:41 +02:00
Philip James Elson
a00cfb1075 Merge branch 'feature/MonteCarlo' into 'master'
Merge of MonteCarlo branch into master

See merge request cara/cara!187
2021-06-10 14:22:47 +00:00
Andre Henriques
ff199020e3 Merge branch 'feature/monte_carlo_in_calculator' into 'feature/MonteCarlo'
Monte-Carlo in calculator

See merge request cara/cara!195
2021-06-07 13:36:53 +00:00
Andre Henriques
6a3751c9e6 Update about page for mc 2021-06-07 12:22:57 +00:00
Andre Henriques
a6bb522de9 Update userguide for mc 2021-06-07 12:19:44 +00:00
Andre Henriques
527a626397 update labels in 'alternative scenarios' plot 2021-06-05 19:36:25 +00:00
Andre Henriques
263330796a update text format in report 2021-06-05 19:34:30 +00:00
Nicolas Mounet
20a288a887 Update requirements.txt 2021-06-05 17:18:14 +00:00
Nicolas Mounet
cf817d0eb7 Modifying sklearn version in requirements 2021-06-05 19:08:46 +02:00
Nicolas Mounet
17956d766d Reverting to a refinement factor of 4 in the time-dependence of Geneva temperature; optimizing the caching; decreasing the timeout value in tests 2021-06-05 18:38:57 +02:00
Nicolas Mounet
56ecf150a2 Fixing on Monte-Carlo test (type issue) 2021-06-05 18:36:06 +02:00
Nicolas Mounet
5b74538fb6 Setting timeout to 30 seconds 2021-06-04 18:09:37 +02:00
Nicolas Mounet
03cbcd4ee5 Merge branch 'feature/monte_carlo_in_calculator' of https://gitlab.cern.ch/cara/cara into feature/monte_carlo_in_calculator 2021-06-04 17:54:58 +02:00
Nicolas Mounet
4241b1c061 Increasing the timeout in tests to 20 seconds; reverting to more accurate sample size & temperature refinement factor (resp. 50000 and 10); changing a few strings in the tests on the report text, that was modified by previous commits 2021-06-04 17:54:21 +02:00
Andre Henriques
30923e490f text edit in alternative scenario notes 2021-06-04 13:25:52 +00:00
Andre Henriques
8dc8e8f42a delete 'Exposure Graph' title 2021-06-04 13:17:45 +00:00
Andre Henriques
6e223050fb update C(t) plot labels 2021-06-04 13:08:03 +00:00
Nicolas Mounet
50a36140ab Decreasing (still to an acceptable level) the accuracy of the mode - less points per hour for the temperature, and less sample points in model_generator 2021-06-04 15:00:02 +02:00
Nicolas Mounet
65b9a72901 Merge branch 'feature/monte_carlo_in_calculator' of https://gitlab.cern.ch/cara/cara into feature/monte_carlo_in_calculator 2021-06-04 14:55:51 +02:00
Nicolas Mounet
8d55eaa632 Improving the reference values used for the test on the temperature time discretization (using a very fine mesh to compute the reference); decreasing the level of accuracy required for this test 2021-06-04 14:55:22 +02:00
Andre Henriques
1d34db3a81 delete repeated events section 2021-06-04 12:40:37 +00:00
Andre Henriques
c7c2969bb8 update of report text 2021-06-04 12:38:36 +00:00
Andre Henriques
f672ee4208 change CERN theme text for COVID measures 2021-06-04 12:25:29 +00:00
Nicolas Mounet
71b59357fa Adding 0.25 ACH to all ventilation schemes in calculator; changing modele_generator tests accordingly 2021-06-04 14:16:35 +02:00