pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1086 commits 24 branches 13 tags 17 MiB
Commit graph

1086 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nicolas Mounet
dfe1efe0e4 Merge branch 'feature/exposure_model_f_dep' into 'feature/MonteCarlo' 
Adding fraction_deposited (f_dep) to ExposureModel

See merge request cara/cara!191
 2021-06-01 19:40:50 +00:00
Nicolas Mounet
0cc1e85ece Adding new sampleable distributions: lognormal and custom (with two different methods) - thanks to Markus Rognlien 2021-06-01 21:40:07 +02:00
Nicolas Mounet
bef2d4949e Adding tests on different kind of sampleable distributions 2021-06-01 21:39:01 +02:00
Nicolas Mounet
a170a139b3 Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/exposure_model_f_dep 2021-06-01 09:30:34 +02:00
Nicolas Mounet
126ae3a846 Merge branch 'feature/refined_expiration_model' into 'feature/MonteCarlo' 
Implementation of BLO model for expiration

See merge request cara/cara!186
 2021-06-01 07:29:09 +00:00
Nicolas Mounet
02cbc2be30 Adding fraction_deposited to ExposureModel (vectorised); improving docstrings 2021-06-01 09:22:15 +02:00
Nicolas Mounet
8193a51f99 Adding tests on fraction_deposited (ExposureModel) - including vectorisation; modifying existing exposure model tests 2021-06-01 09:21:09 +02:00
Nicolas Mounet
390d229944 Caching aerosols computation 2021-05-31 23:23:42 +02:00
Nicolas Mounet
31f13d6457 Merge branch 'feature/MonteCarlo' into feature/refined_expiration_model 2021-05-31 23:12:19 +02:00
Nicolas Mounet
1e6e291501 Merge branch 'feature/refined_mask_model' into 'feature/MonteCarlo' 
New Mask model

See merge request cara/cara!190
 2021-05-31 21:10:42 +00:00
Nicolas Mounet
4a211aa7fc Fixing tests with the change of Expiration, in particular: removing useless tests on aerosols in test_known_quantities; removing reference to Unmodulated vocalization expiration type; avoiding the use of factor_exhale as array; changing some integration test values on r0; replacing some integration tests on r0 by integration tests on quanta_exposure with a simpler model; changing values in some concentration tests 2021-05-31 23:09:22 +02:00
Nicolas Mounet
62a4880a5b Avoiding vectorisation of factor_exhale, and changing test_infected_population accordingly (incompatibility with scipy quad integration) 2021-05-31 17:12:18 +02:00
Nicolas Mounet
3a39043522 More accurate B, L and O modes; correcting units 2021-05-31 16:41:41 +02:00
Nicolas Mounet
612a4c8e08 New expiration test to make sure expiration rates are correct 2021-05-31 16:38:00 +02:00
Nicolas Mounet
d12e809d80 Better import of scipy.integrate 2021-05-31 11:29:49 +02:00
Nicolas Mounet
ecf9ce8655 Removing old Expiration class; replaced by previously named ExpirationBLO class 2021-05-31 11:08:42 +02:00
Nicolas Mounet
8e68bd7a23 Removing old Expiration and ref. to ExpirationBLO in test_expiration 2021-05-31 11:07:53 +02:00
Nicolas Mounet
43cdb36a47 Merge branch 'feature/refined_mask_model' into feature/refined_expiration_model 2021-05-31 09:30:43 +02:00
Nicolas Mounet
2129cf8fe2 Merge branch 'feature/refined_mask_model' of https://gitlab.cern.ch/cara/cara into feature/refined_mask_model 2021-05-31 09:13:50 +02:00
Nicolas Mounet
a61e900178 Fixing docstring 2021-05-31 09:10:14 +02:00
Nicolas Mounet
be5aea72f0 Mask exhale_efficiency use now a diameter in microns 2021-05-31 09:10:14 +02:00
Nicolas Mounet
421495241e Fixing the remaining tests, with the new masks 2021-05-31 09:10:14 +02:00
Nicolas Mounet
cb1b31c820 Starting to modify exposure tests according to new Mask class 2021-05-31 09:10:14 +02:00
Nicolas Mounet
58e40eff27 Propagating the change in Mask class to the calculator and expoert apps 2021-05-31 09:10:14 +02:00
Nicolas Mounet
8305144b1d Modifying infected populations tests and concentration tests, according to the new Mask class 2021-05-31 09:10:14 +02:00
Nicolas Mounet
d5fb86d694 Removing _MaskBase and old Mask class, which is replaced by MeasuredMask 2021-05-31 09:10:14 +02:00