Commit graph

1563 commits

Author SHA1 Message Date
Luis Aleixo
f15f2368b3 typo in short-range words 2022-05-31 16:15:24 +02:00
Luis Aleixo
c407ca4518 reduced jet size on animation for short range 2022-05-31 16:03:36 +02:00
Luis Aleixo
071cbbb7b0 Modified message declaration on the if statements of the report for different warning levels 2022-05-31 14:54:17 +02:00
Luis Aleixo
3a6daed66d Changed images for short and long range P(I) 2022-05-31 14:40:57 +02:00
Luis Aleixo
894d95d3ce Adapted green level cern message 2022-05-30 12:21:46 +02:00
Andre Henriques
b3a02e9c52 Merge branch 'feature/new_green' into 'master'
new statement for Green level

See merge request cara/cara!359
2022-05-30 12:04:37 +02:00
Luis Aleixo
164333b1a2 Adapted P(I) and R0 report messages 2022-05-30 11:45:06 +02:00
Luis Aleixo
34353bb3ce rearranged if statements on report.html.j2 file 2022-05-30 11:34:45 +02:00
CERN\Andrejh
1b4d297afb new statement 2022-05-30 10:08:45 +02:00
Andre Henriques
53fc660346 Merge branch 'feature/retry_decorator_tests' into 'master'
Removed retry and types-retry decorators from requirements

See merge request cara/cara!357
2022-05-30 09:26:20 +02:00
Luis Aleixo
844d403c90 changed retry decorator to be only in the tests and not in the core installation 2022-05-30 09:18:01 +02:00
Luis Aleixo
10e54c615c Added images to the interactions (with and without short range) 2022-05-25 11:18:58 +02:00
Luis Aleixo
07869bceb8 Adapted the short range probability message and corrected mobile resize for text box 2022-05-25 11:18:57 +02:00
Luis Aleixo
937ff8c2ed Added long range interaction into the alternative scenarios 2022-05-25 11:18:57 +02:00
Luis Aleixo
971d9294de adapted report to display multiple PI 2022-05-25 11:18:57 +02:00
Luis Aleixo
c112fa88e4 Removed retry and types-retry decorators from requirements 2022-05-25 09:25:10 +02:00
Luis Aleixo
58811914c5 Merge branch 'feature/zenodo' into 'master'
Added repository zenodo reference

Closes #265

See merge request cara/cara!355
2022-05-11 17:16:46 +02:00
Luis Aleixo
26cf6fb0f0 added missing newline 2022-05-11 17:09:32 +02:00
Luis Aleixo
601ff171d6 Added newline in readme 2022-05-11 17:09:32 +02:00
Luis Aleixo
fe078f1446 Added zenodo DOI for repository into the readme and index.html.j2 page 2022-05-11 17:09:32 +02:00
Andre Henriques
72dfcfa5a0 Merge branch 'feature/pipeline_retry' into 'master'
Added @retry decorator with default values

See merge request cara/cara!354
2022-05-11 16:15:30 +02:00
James Devine
55c8c8d58c Merge branch 'model/humidity_function' into 'master'
Implement new virus half-life formula (humidity & temp. dependent)

See merge request cara/cara!351
2022-05-11 09:52:45 +02:00
Luis Aleixo
45a8e73a48 added retry decorator on test_webapp.py 2022-05-10 17:02:40 +02:00
Luis Aleixo
96af782737 Added humidity and inside_temp to the default values for the baseline form data 2022-05-10 11:56:49 +02:00
Luis Aleixo
0b9582ce31 exposure of the inside_temp and humidity to the API 2022-05-10 11:41:19 +02:00
Luis Aleixo
e3d9dc66ff added retry requirement to setup.py 2022-05-09 17:22:26 +02:00
Luis Aleixo
8b03425f00 added retry decorator with default values 2022-05-09 17:15:14 +02:00
Luis Aleixo
1e689af19c updated half-life formula and respective tests 2022-05-09 16:29:52 +02:00
jdevine
f518a893d5 Corrected handling of min-1/hr-1 half life
Changed half life 'limit' value to 6.43 (as paper model, used when formula gives negative values).
2022-05-09 14:04:27 +02:00
Andre Henriques
8087405319 Merge branch 'feature/short_range_interpersonal_distance' into 'master'
Added Custom distribution for interpersonal distances

Closes #254

See merge request cara/cara!346
2022-05-05 12:13:13 +02:00
Luis Aleixo
16e0e8d4ea Merge branch 'increase-tests-timeout' into 'master'
tests: increase request timeout

Closes #257

See merge request cara/cara!352
2022-05-04 17:04:24 +02:00
Luis Aleixo
a7bcc3ec2c Removed beta distribution and added custom distribution for the interpersonal distances distribution 2022-05-02 11:18:49 +02:00
Luis Aleixo
645bdd0197 Merge branch 'master' into model/humidity_function 2022-04-29 17:23:57 +02:00
Nicola Tarocco
236eaee456 tests: increase request timeout
* increases HTTP request timeout in tests
* closes #257
2022-04-28 15:44:02 +02:00
Luis Aleixo
5dcb698622 Updated humidity value to be in percentage 2022-04-27 15:23:46 +02:00
Luis Aleixo
71f36e0aa4 Changed inside_temp to be passed as vectorised_float in the decay_constant method call 2022-04-27 14:09:24 +02:00
Andre Henriques
936f116d69 Merge branch 'feature/shortrange_MonteCarlo_decoupling' into 'master'
Fix the probability of infection with short-range interactions

See merge request cara/cara!349
2022-04-26 14:35:25 +02:00
Luis Aleixo
45c85cec3f Merge branch 'master' into model/humidity_function 2022-04-26 14:31:27 +02:00
Nicolas Mounet
f0bdda7c7d Adding mask inhale efficiency factor to short-range exposure; adding corresponding test; some cosmetics in test_short_range_model.py 2022-04-26 11:19:33 +02:00
Andre Henriques
5d1f941dbf Merge branch 'feature/nat_vent_bug' into 'master'
Fixed bug on frequency and duration on natural ventilation

Closes #261

See merge request cara/cara!350
2022-04-26 09:21:19 +02:00
Nicolas Mounet
faaf1ed086 In models, ExposureModel: multiplication by dilution factor done in a better place, in deposited_exposure_between_bounds method 2022-04-25 17:32:30 +02:00
Nicolas Mounet
2d1f7fa823 Fixing bug pointed in issue #262 2022-04-25 17:25:59 +02:00
Luis Aleixo
c665f31df9 adjusted tests for the formula from Dabish et al 2022-04-25 17:24:03 +02:00
Nicolas Mounet
ac49e102d4 Removing commented decorator in test_full_algorithm.py; inverting order Speaking/Breathing in short-range tests in test_full_algorithm.py 2022-04-25 17:24:03 +02:00
jdevine
71078671f9 Updated formula to reflect published correction 2022-04-25 16:20:29 +02:00
Luis Aleixo
0a18ce7e96 fixed test values 2022-04-25 15:52:34 +02:00
Luis Aleixo
9b13720062 Fixed bug on frequency and duration on natural ventilation 2022-04-25 15:37:55 +02:00
Luis Aleixo
64ebb663e7 Handled mypy errors and increased number of decimals on test exposure model 2022-04-25 15:14:46 +02:00
jdevine
a85a05316f Adjusted tests, modified expected outputs for new temperature and humidity dependent halflife method 2022-04-25 11:36:49 +02:00
Nicolas Mounet
6d9210939d Updating version number 2022-04-23 09:45:03 +02:00