Commit graph

77 commits

Author SHA1 Message Date
Phil Elson
ffbe9baba6 Improve the class hierachy, and add an extra ExpertApp test. 2020-11-19 12:49:19 +01:00
markus
936b339edf fix pipeline 2020-11-19 12:44:39 +01:00
jdevine
7cc38af9c2 Changed test results to match new values, take 2 2020-11-17 19:44:46 +01:00
jdevine
d3af776951 Changed test results to match new values 2020-11-17 19:38:47 +01:00
jdevine
8f10706d3e Updated tests a little 2020-11-17 19:24:07 +01:00
jdevine
b6403690e7 Updated activity types and profiles. Documentation updated as well. 2020-11-17 19:15:33 +01:00
Nicolas Mounet
1478bdd0b4 Merge branch 'feature/reproduction_rate' into 'master'
Implement an ExposureModel.reproduction_number, which is modelled by having precisely one infected person in the concentration model

Closes #98

See merge request cara/cara!88
2020-11-13 18:15:22 +00:00
Phil Elson
b4ebad785f Allow the COVID calculator to have a blended Expiration type to represent conversations. 2020-11-13 16:42:29 +01:00
Phil Elson
31f628f9e5 Implement an ExposureModel.reproduction_number, which is modelled by having precisely one infected person in the concentration model. 2020-11-12 21:27:01 +01:00
Nicolas Mounet
3860e39959 Adding second coffee break in test on exposed presence interval (test_model_generator.py) 2020-11-12 18:58:25 +01:00
Nicolas Mounet
306e7fc31d tests for modele_generator: replace test on presence intervals by two tests on infected and exposed presence intervals 2020-11-12 18:40:03 +01:00
Nicolas Mounet
439c9fee07 Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/outside_temp_always_lower 2020-11-11 18:33:25 +01:00
Nicolas Mounet
103c820ada Changing the r0 for June in tests, following the enforcement of a minimum temperature difference 2020-11-11 14:13:23 +01:00
markus
48e0b9d6cc update test 2020-11-11 11:35:28 +01:00
Phil Elson
7b43eb0ea5 Rename Model to ConcentrationModel. 2020-11-10 17:19:19 +01:00
Phil Elson
200e7cb14b Apply ExposureModel to both the expert and calculator apps. 2020-11-10 16:46:35 +01:00
Phil Elson
43da2d7521 Implement exposed activity/mask wearing independently of the infected group. 2020-11-10 15:45:39 +01:00
Nicolas Mounet
6dacddedbe Improve readability of tests; adding 2 end-to-end tests (on infection probability) 2020-11-09 18:32:56 +01:00
Nicolas Mounet
c264e6bfc2 Moving Geneva temperature from cara/models.py to cara/data.py 2020-11-09 17:11:26 +01:00
Nicolas Mounet
d56731cebc Adding a test of the interpolation in the PiecewiseConstant.refine method 2020-11-09 16:02:11 +01:00
Nicolas Mounet
5a5de009bc Adding a test to that a finer mesh has no impact in itself 2020-11-09 12:37:40 +01:00
Phil Elson
8f973136e0 Allow WindowOpening to have more than one window of the given dimensions. 2020-11-09 09:43:47 +01:00
Phil Elson
eb2f8d99e8 Remove the use of the direct dictionary (un validated) data in favour of the FormData class. 2020-11-06 23:12:04 +01:00
Phil Elson
dc73bd77d1 Fix the form to model transformation. 2020-11-06 16:38:09 +01:00
Phil Elson
73abcf8596 Implement the coffee break method. 2020-11-06 16:12:59 +01:00
markus
aafc6f3b9f use infected_start/finish to calculate present_intervals and coffee_times 2020-11-06 15:30:43 +01:00
Philip James Elson
c308387341 Merge branch 'key-validation' into 'master'
Key validation

See merge request cara/cara!38
2020-11-06 13:52:44 +00:00
Nicolas Mounet
ac208eb2be Minor (transparent) fix in model_generator test for HEPA 2020-11-06 14:33:57 +01:00
markus
76d74132ef use correct windows_open value-name 2020-11-06 14:06:15 +01:00
Nicolas Mounet
98f2b77350 Adding tests for window ventilation with HEPA in test_model_generator 2020-11-06 13:31:19 +01:00
Nicolas Mounet
c5e6540406 Adding a test for models (checking that until the first presence time of an infected person, the concentration remains at zero) 2020-11-06 13:19:17 +01:00
Nicolas Mounet
860d68583d Adding tests for mechanical ventilation in test_model_generator 2020-11-06 13:18:01 +01:00
markus
d5d572c943 add test_key_validation 2020-11-06 12:36:53 +01:00
markus
a2512e2798 add test_ventilation 2020-11-06 10:05:15 +01:00
Philip James Elson
adb1f901ef Merge branch 'develop/multiple_ventilation' into 'master'
Multiple ventilations

Closes #44 and #18

See merge request cara/cara!29
2020-11-05 22:26:35 +00:00
Phil Elson
331b8e733f Fix to use the updated PiecewiseConstant scheme for temperatures, and turn on testing, even if trivial, for the report generation. 2020-11-05 23:22:17 +01:00
Nicolas Mounet
d437c7e779 Adding test on the use of the model with a MultipleVentilation object (computing concentration); some fine tuning on other tests (list -> tuple) 2020-11-05 22:15:15 +01:00
Nicolas Mounet
28427cda52 Adding test on transition times for PiecewiseConstant objects; better layout on some other test 2020-11-05 21:46:10 +01:00
Nicolas Mounet
7e927490dd Fixing multiple ventilation tests; adding a test on transition times for multiple ventilations; minor changes to window opening with time-dependent temperature test 2020-11-05 20:49:07 +01:00
Nicolas Mounet
3cffcb34af Correcting multiple ventilation tests 2020-11-05 18:51:01 +01:00
Nicolas Mounet
f271b29ae1 Adding tests for multiple ventilation 2020-11-05 18:42:05 +01:00
Philip James Elson
bc88455d79 Merge branch 'present-intervals' into 'master'
Present intervals

See merge request cara/cara!26
2020-11-05 15:39:16 +00:00
markus
f896cbf094 add test for present_intervals 2020-11-05 16:17:52 +01:00
Phil Elson
e663a89560 Parameterize the tests to allow easier debugging and simplify the logic in the test itself. 2020-11-05 12:55:00 +01:00
Philip James Elson
aadbb8c1dd Merge branch 'develop/temperature_dependency' into 'master'
Implementation of outside temperature time dependency

Closes #15

See merge request cara/cara!19
2020-11-05 11:43:36 +00:00
Nicolas Mounet
4ea8b70079 Adding tests on values beyond the interval of definition, for piecwise constant functions; some tests renaming 2020-11-05 12:07:26 +01:00
Phil Elson
f7853feb6f Restructure the calculator app to have a strong separation between the form input and the form processing. 2020-11-05 11:05:40 +01:00
Nicolas Mounet
f9335710b6 Renaming PiecewiseconstantFunction class into PiecewiseConstant 2020-11-05 09:10:07 +01:00
Nicolas Mounet
3604c6c91c Adding two tests for the hourly dependent model 2020-11-05 01:04:32 +01:00
Nicolas Mounet
ae5cb9536b baseline_model in tests and expert.py, now use piecewise constant temperatures 2020-11-04 23:39:41 +01:00