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 |
|
Nicolas Mounet
|
3226bb04e8
|
Modifying tests on mask to comply with a single Mask class
|
2021-05-31 09:10:14 +02:00 |
|
Nicolas Mounet
|
6fd8d6531b
|
Fixing previous merge
|
2021-05-31 09:10:06 +02:00 |
|
Nicolas Mounet
|
9325eea09e
|
Fixing docstring
|
2021-05-31 08:55:55 +02:00 |
|
Nicolas Mounet
|
bfdb3e322e
|
Mask exhale_efficiency use now a diameter in microns
|
2021-05-31 06:55:07 +02:00 |
|
Nicolas Mounet
|
1f39bbb292
|
Merge branch 'feature/MonteCarlo' of https://gitlab.cern.ch/cara/cara into feature/MonteCarlo
|
2021-05-31 06:47:11 +02:00 |
|
Nicolas Mounet
|
ffb85c6b72
|
Fixing the remaining tests, with the new masks
|
2021-05-31 06:32:17 +02:00 |
|
Nicolas Mounet
|
d7bd53c288
|
Starting to modify exposure tests according to new Mask class
|
2021-05-30 19:31:56 +02:00 |
|
Nicolas Mounet
|
0087bff41e
|
Propagating the change in Mask class to the calculator and expoert apps
|
2021-05-30 19:31:13 +02:00 |
|
Nicolas Mounet
|
26075cd53c
|
Modifying infected populations tests and concentration tests, according to the new Mask class
|
2021-05-30 19:30:25 +02:00 |
|
Nicolas Mounet
|
fa0550233c
|
Removing _MaskBase and old Mask class, which is replaced by MeasuredMask
|
2021-05-30 19:28:51 +02:00 |
|
Nicolas Mounet
|
947bd013e0
|
Modifying tests on mask to comply with a single Mask class
|
2021-05-30 19:25:39 +02:00 |
|
Nicolas Mounet
|
b04dfbad01
|
Fixing previous merge
|
2021-05-30 07:56:06 +02:00 |
|
Nicolas Mounet
|
4c2abf797b
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/refined_mask_model
|
2021-05-30 07:44:40 +02:00 |
|
Nicolas Mounet
|
0b26a0da2b
|
Merge branch 'feature/mc_module' into 'master'
Introduce a cara.monte_carlo subpackage for managing monte carlo simulations
See merge request cara/cara!189
|
2021-05-29 17:12:01 +00:00 |
|
Nicolas Mounet
|
de5e96fd0f
|
Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function)
|
2021-05-28 17:43:06 +02:00 |
|
Nicolas Mounet
|
95640cb5be
|
Modifying eta_inhale of Type I measured mask according to CERN report
|
2021-05-28 17:41:56 +02:00 |
|
Nicolas Mounet
|
4aa819bea4
|
Correction in docstring of _MaskBase
|
2021-05-28 17:41:56 +02:00 |
|
Nicolas Mounet
|
adc11cb527
|
New method inhale_efficiency in _MaskBase; using _MaskBase everywhere needed (also for types); new MeasuredMask with different exhale_efficiency functions; new mask types
|
2021-05-28 17:41:56 +02:00 |
|
Nicolas Mounet
|
78cdb22798
|
Adding tests on Mask (new classes and new methods)
|
2021-05-28 17:40:27 +02:00 |
|