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
Nicolas Mounet
9322c27af9
Introducing _MaskBase class, of which Mask is a subclass
2021-05-28 17:40:27 +02:00
Phil Elson
604422fbb5
Improve the type handling of the MC model generation. This is tested more thoroughly later when generating type stubs.
2021-05-28 17:34:47 +02:00
Phil Elson
38fe6e734e
Review actions for monte carlo models.
2021-05-28 17:23:43 +02:00
Phil Elson
9669e5afd0
Add a cara.monte_carlo submodule as syntactic sugar on top of the existing cara.models vectorisation.
...
This allows us to define SampleableDistributions for key variables (and in the future, good default values for these), as well as giving us an exact mirror of the non-MC models which we can ultimately generate those models.
2021-05-28 17:21:53 +02:00
Philip James Elson
fd4ceef0f1
Merge branch 'feature/mult_expiration' into 'master'
...
MultipleExpriation implementation
See merge request cara/cara!188
2021-05-28 08:55:19 +00:00
Phil Elson
8ac3b4cbd9
Avoid the use of the updates from #184 .
2021-05-28 10:50:33 +02:00
Nicolas Mounet
f050214237
Improving docstrings in expiration classes
2021-05-28 10:48:23 +02:00
Nicolas Mounet
b8422aaf1b
Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function)
2021-05-28 10:48:01 +02:00
Nicolas Mounet
720bf1a56a
Adapting tests for model_generator
2021-05-28 10:47:30 +02:00
Nicolas Mounet
a3bd951d36
Adding tests for MultipleExpiration
2021-05-28 10:47:24 +02:00
Nicolas Mounet
cd3f9057f9
Dealing better with the units in ExpirationBLO.aerosols
2021-05-28 07:08:23 +02:00
Nicolas Mounet
89126313ba
Merge branch 'feature/multiple_expiration' into feature/refined_expiration_model
2021-05-28 07:02:30 +02:00
Nicolas Mounet
6e49ed4f02
Improving docstrings in expiration classes
2021-05-28 06:56:13 +02:00
Nicolas Mounet
a9cd36df75
Minor docstring fix in ExpirationBLO
2021-05-27 18:35:54 +02:00
Nicolas Mounet
23510c8f1a
Adding BLO model for expiration (ExpirationBLO class)
2021-05-27 18:26:37 +02:00
Nicolas Mounet
22539e2f9f
Adding test on BLO expiration
2021-05-27 18:17:59 +02:00
Nicolas Mounet
f34a77071a
Merge branch 'feature/refined_mask_model' into feature/multiple_expiration
2021-05-27 13:56:15 +02:00
Nicolas Mounet
213dd2fb92
Modifying eta_inhale of Type I measured mask according to CERN report
2021-05-27 13:44:03 +02:00
Nicolas Mounet
af730ccd7c
Introducing _ExpirationBase and MultipleExpiration classes; adapting tests and model_generator accordingly (removing now obsolete expiration_blend function)
2021-05-27 13:40:46 +02:00
Nicolas Mounet
a8081d8b0b
Adapting tests for model_generator
2021-05-27 12:34:14 +02:00
Nicolas Mounet
beb2fd7371
Adding tests for MultipleExpiration
2021-05-27 12:33:12 +02:00
Nicolas Mounet
fec6a71c62
Correction in docstring of _MaskBase
2021-05-27 09:20:28 +02:00
Nicolas Mounet
48f0c39581
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-26 23:39:33 +02:00
Nicolas Mounet
676fd64844
Adding tests on Mask (new classes and new methods)
2021-05-26 23:37:10 +02:00
Nicolas Mounet
9d4ffdb890
Introducing _MaskBase class, of which Mask is a subclass
2021-05-26 18:57:56 +02:00
Nicolas Mounet
128182376c
Merge branch 'update/qID' into 'master'
...
code comment update for quantum_infectious_dose
See merge request cara/cara!183
2021-05-26 16:18:50 +00:00
Andre Henriques
1026546d18
code comment update for quantum_infectious_dose
2021-05-26 12:47:30 +00:00
Philip James Elson
2a3c3eb138
Merge branch 'feature/RH_dependent_virus_halflife' into 'master'
...
Humidity dependence of virus halflife & central heating option in calculator
Closes #148
See merge request cara/cara!180
2021-05-26 08:19:53 +00:00
Nicolas Mounet
6ec0c48fa7
Adding central heating option in calculator (including tooltip and user guide - thanks to J. Devine)
2021-05-26 08:19:52 +00:00
Philip James Elson
9431724962
Merge branch 'feature/mask_and_expiration_general_model' into 'master'
...
Mask and expiration: more general model
See merge request cara/cara!182
2021-05-26 07:59:39 +00:00
Nicolas Mounet
1f06a44fff
Making exhale_efficiency diameter dependent (Mask class), and improved aerosols method in Expiration class
2021-05-26 07:59:38 +00:00
Nicolas Mounet
3244f8ba8f
Merge branch 'feature/virus_qid' into 'master'
...
Virus coefficient_of_infectivity replaced by its inverse (qID)
See merge request cara/cara!181
2021-05-26 07:16:20 +00:00
Nicolas Mounet
ca1440bf5c
Replacing qID by quantum_infectious_dose
2021-05-26 08:55:38 +02:00
Nicolas Mounet
3e9652d012
Removing pre-defined distributions; removing coefficient_of_infectivity
2021-05-25 16:25:30 +02:00
Nicolas Mounet
19d25310dc
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/virus_qid_and_viral_loads
2021-05-25 16:12:21 +02:00
