Commit graph

1631 commits

Author SHA1 Message Date
Luis Aleixo
8855dfc75a Changed test values on test_monte_carlo_full_models 2022-02-03 15:14:33 +01:00
Luis Aleixo
2a43fffec9 changed docstring on models.py for the deposited_expoure method 2022-02-03 10:55:06 +01:00
Luis Aleixo
fee2bcab86 Changed test values on test_known_quantities 2022-02-03 10:54:44 +01:00
Luis Aleixo
c24853516b Changed test_monte_carlo.py exposure method 2022-02-03 10:10:53 +01:00
Luis Aleixo
dd77ba5090 added self.repeats to the deposited exposure calculation 2022-02-02 17:24:41 +01:00
Luis Aleixo
b7007ae345 deposited exposure as public method 2022-02-02 17:03:23 +01:00
Luis Aleixo
996230333c Set new logic for the cern_level color variable 2022-02-02 12:23:17 +01:00
Luis Aleixo
fbe47fa4d4 Removed exposure_between_bounds and exposure methods; created a deposited_exposure_between_bounds that considers the previous inf_aero; created deposited_exposure method that calls the deposited_exposure_between_bounds within start and stop times during the day; consider these methods to calculate the cumulative dose 2022-02-02 11:27:46 +01:00
Andre Henriques
584031e006 Merge branch 'feature/version_update' into 'master'
CARA version update following MR 307

See merge request cara/cara!325
2022-02-01 17:35:44 +01:00
Luis Aleixo
b5fd442c67 Version update 2022-02-01 17:26:30 +01:00
Andre Henriques
28a59fc075 Merge branch 'feature/pi_thresholds_animation' into 'master'
Updated missing threshold values on CERN applicable rules

Closes #244

See merge request cara/cara!324
2022-02-01 16:53:55 +01:00
Luis Aleixo
b813ce505b Updated missing threshold values on CERN applicable rules 2022-02-01 16:48:01 +01:00
Andre Henriques
b84d63ae25 Merge branch 'feature/pi_thresholds' into 'master'
New threshold values on CERN theme

Closes #244

See merge request cara/cara!323
2022-02-01 14:38:14 +01:00
Andre Henriques
a645263c31 Merge branch 'feature/scientific_model_update' into 'master'
Model updates with virology parameters

See merge request cara/cara!307
2022-02-01 14:06:07 +01:00
Luis Aleixo
02468f42fa updated threshold values 2022-02-01 12:14:49 +01:00
Luis Aleixo
3e4aa09eee Moved SAMPLE_SIZE and TOLERANCE to the respective test where they are used 2022-02-01 09:30:41 +01:00
Luis Aleixo
99388d2fe5 Removed unused console.log and changed logic for generating the short range interactions list 2022-01-28 12:08:28 +01:00
Luis Aleixo
68d495ee8e Move toronto temperatures into test_monte_carlo_full_models where it is used 2022-01-28 11:18:47 +01:00
Luis Aleixo
7c0012d355 handled case when back navigation is performed with changing the short range option 2022-01-27 17:23:42 +01:00
Nicolas Mounet
7af1abcde6 Minor fixes in cara/models.py 2022-01-27 15:38:25 +01:00
Andre Henriques
3b89ce1e43 Merge branch 'feature/covid_level_text' into 'master'
Covid level text update

See merge request cara/cara!321
2022-01-27 13:25:08 +01:00
Nicolas Mounet
8b485e80a7 Bug fix in Exposure class (cara/models.py) 2022-01-27 10:39:15 +01:00
Nicolas Mounet
46146b2a45 Improving fraction_deposited docstrings (in cara/models.py) 2022-01-27 10:14:43 +01:00
Nicolas Mounet
5302001ed9 Restructuring exposure class to avoid smelly code (cara/models.py) 2022-01-26 20:47:28 +01:00
Luis Aleixo
6b8f71048a Added covid level variable comments on the code for future reference. 2022-01-26 17:46:54 +01:00
Luis Aleixo
10565bd448 Updated covid level text 2022-01-26 17:14:52 +01:00
Luis Aleixo
ff8f9f9482 Merge branch 'master' into feature/short_range_concentrations 2022-01-26 16:53:33 +01:00
Luis Aleixo
b7a9a724a7 Merge branch 'master' into feature/scientific_model_update 2022-01-26 15:18:42 +01:00
Luis Aleixo
0fa12a6a6d code simplification 2022-01-26 15:15:30 +01:00
Andre Henriques
c4fbb03adf Merge branch 'feature/numpy_updates' into 'master'
Adapted code to the new numpy version

Closes #233

See merge request cara/cara!320
2022-01-26 14:58:08 +01:00
Nicolas Mounet
9b1a324369 Minor change in models: particle methods changed into properties 2022-01-26 14:23:31 +01:00
Nicolas Mounet
c9329da4d1 models.py: some re-structuring to removing some code-smells (introduction of a Particle class where settling velocity and deposited fraction are computed) 2022-01-26 13:03:37 +01:00
Nicolas Mounet
9da5b5b929 Improving docstring for cn in Expiration class 2022-01-25 22:53:41 +01:00
Luis Aleixo
aae45ad456 Merge branch 'master' into feature/scientific_model_update 2022-01-25 17:21:53 +01:00
Luis Aleixo
f7cec0ea88 handled error on short_range_option 2022-01-25 17:20:06 +01:00
Luis Aleixo
2666317056 Remake of validation on save and add buttons 2022-01-25 17:12:24 +01:00
Luis Aleixo
f5cf945450 added validation for duration 2022-01-25 16:39:35 +01:00
Luis Aleixo
f448bc233e added new verifications for lunch time and simulation time 2022-01-25 15:54:41 +01:00
Luis Aleixo
d8e8398eeb Adapted code to new numpy version 2022-01-24 16:07:23 +01:00
Luis Aleixo
df4fe11bd4 numpy version 2022-01-24 15:05:34 +01:00
Luis Aleixo
722278b154 Corrected typing types and fixed tests 2022-01-24 15:01:16 +01:00
Luis Aleixo
ad0f55acf1 Merge branch 'master' into feature/short_range_concentration 2022-01-21 17:33:19 +01:00
Luis Aleixo
141e234611 Short range interactions modal dialog and validation 2022-01-21 17:32:17 +01:00
Luis Aleixo
1ea01c1274 Short range presence and short range activities as part of the backend model 2022-01-21 17:11:05 +01:00
Luis Aleixo
0a6472bdbf oneoverln2 back on the header of models.py 2022-01-17 14:09:24 +01:00
Luis Aleixo
f5f0365725 Added cn reference to the code 2022-01-17 14:01:40 +01:00
Luis Aleixo
8b6f399e02 Merge branch 'feature/openshift_template_router' into 'master'
Updated config-fetch and config-generate for routes.yaml

See merge request cara/cara!319
2022-01-13 17:43:30 +01:00
Luis Aleixo
008efd3467 Updated config-fetch and config-generate for routes.yaml 2022-01-13 17:38:02 +01:00
Luis Aleixo
7dd6e93e0d Merge branch 'feature/openshift_template_router' into 'master'
README update concerning routes.yaml

See merge request cara/cara!318
2022-01-13 17:14:29 +01:00
Luis Aleixo
a73f8ec5de Changed routes.yaml file name and respective reference in README 2022-01-13 16:36:01 +01:00