Commit graph

962 commits

Author SHA1 Message Date
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
Nicolas Mounet
a34e22097e Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/monte_carlo_in_calculator 2021-06-04 13:47:42 +02:00
Nicolas Mounet
934ba106e8 Merge branch 'feature/integration_tests_with_mc' into 'feature/MonteCarlo'
Introducing integration tests for Monte-Carlo; new gravitational settlement

See merge request cara/cara!194
2021-06-04 11:46:08 +00:00
Nicolas Mounet
3a8c20a38a Adding sklearn to requirements.txt 2021-06-04 13:45:36 +02:00
Nicolas Mounet
8473398403 Using Monte-Carlo approach in calculator; hard-coding the sample size for now 2021-06-04 13:43:35 +02:00
Nicolas Mounet
2f61cf1a96 Adding more quantities to test in integration tests (qR, dose); improving test structure 2021-06-04 11:58:23 +02:00
Nicolas Mounet
82667698d5 Adding comment to refer to CERN report for the gravitational settlement 2021-06-04 10:24:02 +02:00
Nicolas Mounet
6d70e41f6a Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/integration_tests_with_mc 2021-06-04 09:27:15 +02:00
Nicolas Mounet
bab0c877ec Merge branch 'feature/activity_and_viral_loads_distributions' into 'feature/MonteCarlo'
activity and viral loads pre-defined distributions

See merge request cara/cara!193
2021-06-04 07:26:17 +00:00
Nicolas Mounet
3d06228366 Adding end-to-end integration tests of the full Monte-Carlo approach (comparison with CERN report cases and a few more) 2021-06-04 09:24:38 +02:00
Nicolas Mounet
cc98bf003b Fix the tests which depend on the gravitational settlement (tests on concentration, its integration, r0, etc.); set a common seed for all tests 2021-06-04 09:23:48 +02:00
Nicolas Mounet
4fe0fbefbe Modifying vg for gravitational settlement, to comply with the CERN note 2021-06-04 05:45:25 +02:00
Nicolas Mounet
944db9bf8a Minor (transparent) fix in some variable name 2021-06-03 10:47:24 +02:00
Nicolas Mounet
0f1473ee52 Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/activity_and_viral_loads_distributions 2021-06-03 10:37:31 +02:00
Nicolas Mounet
14d712d12f Merge branch 'feature/new_sampleable_distributions' into 'feature/MonteCarlo'
Adding new sampleable distributions: lognormal and custom

See merge request cara/cara!192
2021-06-03 08:36:21 +00:00
Nicolas Mounet
d246530704 Adding data.py with pre-defined distributions for breathing rates and viral loads 2021-06-03 10:35:17 +02:00
Nicolas Mounet
cc628cd1e6 Adding tests on predefined distributions 2021-06-03 10:23:19 +02:00
Nicolas Mounet
387fda67d8 Improving tests on sampleable distributions (more robust; using seed); adding test for LogCustomKernel 2021-06-02 12:45:49 +02:00
Nicolas Mounet
61b06fc1f0 Adding LogCustomKernel sampleable distribution (curve is vs. a log variable) 2021-06-02 12:43:10 +02:00
Nicolas Mounet
b7f4ad8c3e Adding a TODO in sampleable tests 2021-06-02 09:06:38 +02:00
Nicolas Mounet
185d576397 Adding sklearn to the dependencies 2021-06-02 07:16:00 +02:00
Nicolas Mounet
8675362950 Minor fix in docstring 2021-06-01 21:48:04 +02:00
Nicolas Mounet
190a18ba0c Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/new_sampleable_distributions 2021-06-01 21:47:12 +02:00