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 |
|
Philip James Elson
|
97330e2316
|
Merge branch 'feature/activity_vectorisation' into 'master'
Activity vectorisation
See merge request cara/cara!179
|
2021-05-25 09:26:36 +00:00 |
|
Nicolas Mounet
|
e1b9f6ce91
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/activity_vectorisation
|
2021-05-21 11:07:02 +02:00 |
|
Nicolas Mounet
|
d76e7a98d5
|
Removing pre-defined distributions for Activity
|
2021-05-21 11:03:53 +02:00 |
|
James Devine
|
f6c635e359
|
Merge branch 'jdevine-addclimatetoreadme' into 'master'
Update README.md with link to climatology tools repo
See merge request cara/cara!175
|
2021-05-19 13:04:33 +00:00 |
|
James Devine
|
0d71a5a46d
|
Added comments from MR!175, resolves thread.
|
2021-05-17 15:13:14 +00:00 |
|
Gabriella Azzopardi
|
d0eb7c709c
|
Merge branch 'feature/responsive_form' into 'master'
First steps towards making the form reponsive to screensize.
See merge request cara/cara!162
|
2021-05-17 13:39:08 +00:00 |
|
Nicolas Mounet
|
de90292338
|
Correcting viral load distributions (10** was missing)
|
2021-05-14 12:52:38 +02:00 |
|
Nicolas Mounet
|
2e659da45d
|
caching _generate_virus_distribution and ignoring mypy type checking for KernelDensity
|
2021-05-14 12:49:17 +02:00 |
|
Nicolas Mounet
|
57c7c78117
|
caching _generate_activity_distribution (for Activity models)
|
2021-05-14 12:38:35 +02:00 |
|
Nicolas Mounet
|
64565264ea
|
Draft Virus distributions (from M. Rognlien) - does not pass mypy tests and can't be cached yet
|
2021-05-14 10:44:37 +02:00 |
|
Nicolas Mounet
|
d5dcfa5a40
|
Virus class: input is now qID instead of coefficient_of_infectivity (which remains as a property), as in the CERN note
|
2021-05-14 09:15:08 +02:00 |
|
Nicolas Mounet
|
f07bffaa4a
|
Replacing coefficient_of_infectivity by qID in tests
|
2021-05-14 09:11:38 +02:00 |
|
Phil Elson
|
d082156d46
|
Follow-up from Andre's review.
|
2021-05-12 20:08:38 +02:00 |
|
Nicolas Mounet
|
b6bb878fc2
|
Adding predefined Activity distributions
|
2021-05-11 20:00:40 +02:00 |
|
Nicolas Mounet
|
17ffc4f6f8
|
Vectorisation of Activity
|
2021-05-11 18:18:19 +02:00 |
|
Nicolas Mounet
|
1564b9ea65
|
Adding tests on vectorisation of Activity inhalation_rate and exhalation_rate
|
2021-05-11 18:17:43 +02:00 |
|
Philip James Elson
|
6df4a86670
|
Merge branch 'feature/about_page' into 'master'
Introduce About page
Closes #163 and #117
See merge request cara/cara!177
|
2021-05-11 10:20:49 +00:00 |
|
Gabriella Azzopardi
|
77f52a8087
|
Introduce About page
|
2021-05-11 10:20:47 +00:00 |
|
Philip James Elson
|
60568aab35
|
Merge branch 'develop/quick_fix_integration' into 'master'
Minor fix in ConcentrationModel.integrated_concentration
See merge request cara/cara!178
|
2021-05-10 18:29:57 +00:00 |
|
Nicolas Mounet
|
bb4bcebe21
|
Minor fix in ConcentrationModel.integrated_concentration
|
2021-05-10 20:23:54 +02:00 |
|
Gabriella Azzopardi
|
87c7733bb5
|
Merge branch 'feature/error-handling-jinja' into 'master'
Add Jinja error handling details from #117
See merge request cara/cara!167
|
2021-05-10 17:29:05 +00:00 |
|
Philip James Elson
|
9d5743c565
|
Merge branch 'develop/improve_dose_integration' into 'master'
Improvement of integration method in quanta_exposure
See merge request cara/cara!176
|
2021-05-10 17:13:10 +00:00 |
|
Nicolas Mounet
|
feedcc0df1
|
Add ConcentrationModels.integrated_concentration and provide an analytic solution to the integral.
|
2021-05-10 17:13:09 +00:00 |
|
Phil Elson
|
9d89ba725e
|
Spacing between the generate button and the userguide.
|
2021-05-10 07:21:42 +02:00 |
|
James Devine
|
ea5ca699f8
|
Update README.md with link to climatology tools repo
|
2021-05-06 18:09:00 +00:00 |
|
Philip James Elson
|
13cf8bafb3
|
Merge branch 'develop/time_dependence_concentration_model' into 'master'
Avoid using time-dependence of parameters in concentration computation
See merge request cara/cara!172
|
2021-05-06 17:59:56 +00:00 |
|
Nicolas Mounet
|
7d4284e5f9
|
Correcting test_next_state_change_time
|
2021-05-06 06:07:33 +02:00 |
|
Phil Elson
|
31a5954a4a
|
Review actions on time handling.
|
2021-05-05 21:03:36 +02:00 |
|
Nicolas Mounet
|
f613ff80ba
|
Supressing now useless (wrong) tests on time-independence of parameters in ConcentrationModel; adding a test on error handling if time used for concentration computation is beyond the last state change time
|
2021-05-05 12:46:27 +02:00 |
|
Nicolas Mounet
|
817ca8f3bf
|
ConcentrationModel: _next_state_change used only in concentration function, now; improving docstrings and error handling
|
2021-05-05 12:45:02 +02:00 |
|