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

1519 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nicola Tarocco
236eaee456 tests: increase request timeout 
* increases HTTP request timeout in tests
* closes #257
 2022-04-28 15:44:02 +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
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
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
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
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
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
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
James Devine
6226048f9b Return LFS files to repository 2022-04-06 11:48:34 +02:00
Nicolas Mounet
808c71c266 Cosmetic changes in models.py 2022-04-06 11:48:26 +02:00
Nicolas Mounet
ad83e7a127 Fixing full algorithm exposure tests (short-range) 2022-04-06 11:42:19 +02:00
Nicolas Mounet
cb634102ca Changing version number 2022-04-05 19:46:00 +02:00
Nicolas Mounet
ac92c99098 Adding breathing rate factor in short-range deposited exposure (bug fix); more samples in Monte-Carlo general tests 2022-04-05 19:42:22 +02:00
Nicolas Mounet
99e57da469 Adding full algorithm tests on exposure (simple, with virus distributions, and with short-range) 2022-04-05 18:30:14 +02:00
Andre Henriques
f6bd576134 Merge branch 'feature/short_range_concentration' into 'master' 
Short range implementation

See merge request cara/cara!335
 2022-04-05 11:52:15 +02:00
Luis Aleixo
341d83a81d Increased the version to 4.1.0 2022-04-05 11:21:36 +02:00
Luis Aleixo
c63182378e Adapter error message on short range duration 2022-04-04 17:18:00 +02:00
Luis Aleixo
b1f421bbc1 Added warning for 15 minutes duration times on short range 2022-04-04 16:33:13 +02:00
Nicolas Mounet
009c9eea01 Adding full algorithm test (partial - up to concentration only); cosmetic changes; improvement of dilution tests 2022-03-31 18:17:15 +02:00
Luis Aleixo
a2faa2523a Reformulation on short range. Exposure model has now a list of ShortRangeModels for each interaction 2022-03-29 12:19:14 +02:00
Luis Aleixo
5720f0340a Changed label on short range activity and added BR on dilution factor 2022-03-28 15:41:55 +02:00
Luis Aleixo
b51848b755 Merge branch 'master' into feature/short_range_concentration 2022-03-25 16:22:17 +01:00
Andre Henriques
d672fd823f Merge branch 'feature/disclaimer_block' into 'master' 
Disclaimer block

Closes #252

See merge request cara/cara!343
 2022-03-25 16:05:03 +01:00
Luis Aleixo
29f5e9cc0f Fixed bug on legend with firefox 2022-03-25 15:28:30 +01:00
Luis Aleixo
dc1020c159 Added disclaimer from common_text in report page 2022-03-25 15:04:29 +01:00
Luis Aleixo
9ef38329d1 Added Disclaimer to common text 2022-03-25 15:04:29 +01:00
Luis Aleixo
052758cc01 When short range interactions are set, remove alternative scenarios option 2022-03-25 14:57:11 +01:00
Andre Henriques
5b58e13391 Merge branch 'feature/applicable_rules_image' into 'master' 
Warning scale image - CERN template

See merge request cara/cara!342
 2022-03-25 13:40:32 +01:00
Luis Aleixo
c8431e56b2 warning scale at cern image rename 2022-03-25 11:10:57 +01:00
Luis Aleixo
4c0daa36e3 Added long range cumulative line legend and adjusted all legend elements 2022-03-24 17:07:20 +01:00
Luis Aleixo
70e1d2c5fc Changed error for short range interaction out of simulation time 2022-03-24 13:58:55 +01:00
Luis Aleixo
4f6398e819 Replaced "long range" by "long-range" 2022-03-24 13:55:03 +01:00
Luis Aleixo
6355123a34 Merge branch 'master' into feature/short_range_concentration 2022-03-24 11:23:52 +01:00
Luis Aleixo
a1e577015f Changed "short range" to "short-range" 2022-03-24 11:18:08 +01:00