pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1545 commits 24 branches 13 tags 17 MiB
Commit graph

1545 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nicolas Mounet
a86d9a838a In test_short_range_model, removing test on short-range normed exposure (method does not exist anymore), and adding tests on extract_between_bounds method 2022-04-22 22:25:50 +02:00
Nicolas Mounet
9a4790d407 Decoupling jet exposure and the part subtracted from the background concentration, in the short-range model, in order to treat correctly the diameter integrals. This correct the probability of infection. 2022-04-22 22:23:49 +02:00
Nicolas Mounet
b11dd90e92 Adding full algo tests with distributions, in particular on the concentration/dose/probability of infection 2022-04-22 22:21:15 +02:00
Nicolas Mounet
ef84f28ab6 Adding a method to extract the right interaction time boundaries between two given times in the short-range model (cosmetics) 2022-04-22 17:13:15 +02:00
Nicolas Mounet
f99dcc5e0c Fix wrong emission rate in test_monte_carlo_full_models.py::test_small_shared_office_Geneva; decrease tolerance and number of samples subsequently 2022-04-22 16:50:17 +02:00
Luis Aleixo
52300df16b Changed tests - inside temp is now a property of Room 2022-04-22 15:20:20 +02:00
jdevine
5b715937d2 Implemented Humidity + Temperature half life function from Dabish et al. 2022-04-21 13:42:55 +02:00
Luis Aleixo
de5552c236 Updated test values dor beta distribution 2022-04-21 10:00:59 +02:00
Luis Aleixo
1d9d493063 Changed alpha and beta descriptors 2022-04-20 12:12:47 +02:00
James Devine
987454928c Merge branch 'feature/webserver_returns_algo_results_as_json' into 'master' 
Add additional HTTP POST handler (responds with JSON)

See merge request cara/cara!347
 2022-04-19 08:26:51 +02:00
Luis Aleixo
ddf74234f8 Merge with short range integration, version 4.1.1 2022-04-13 17:14:53 +02:00
Luis Aleixo
ce98ba0026 Added beta distribution for interpersonal distances. #254 2022-04-13 11:16:02 +02:00
Pascal Kaiser
7cebd35571 Add test for added HTTP POST handler 2022-04-11 10:24:23 +02:00
Pascal Kaiser
1279ae2549 Add additional HTTP POST handler (responds with JSON) 
- Gets algo input from HTTP POST request body (JSON)
- Returns 'report_data' in HTTP response body (JSON)
 2022-04-11 10:24:10 +02:00
Pascal Kaiser
94e753cb8d Add additional type hints 2022-04-11 10:23:11 +02:00
Andre Henriques
c1589a04fc Merge branch 'feature/short_range_bug_fix_and_tests' into 'master' 
Adding breathing rate factor in short-range deposited exposure (bug fix), and exposure tests for short-range

See merge request cara/cara!345
 2022-04-07 09:29:23 +02:00
Nicolas Mounet
4dd5b8a091 Minor fix in the (largely unused) virus types, for consistency 2022-04-07 06:53:43 +02:00
James Devine
0b58d59bd8 Merge branch 'no_lfs' into 'master' 
Return LFS files to repository

See merge request cara/cara!344
 2022-04-06 11:48:34 +02:00