markus
|
93207ff8e8
|
use minutes_to_string in report
|
2020-11-06 13:52:04 +01:00 |
|
markus
|
0b6acecd47
|
use correct keys
|
2020-11-06 13:51:34 +01:00 |
|
markus
|
c4d474304a
|
add minutes_to_string
|
2020-11-06 13:51:03 +01:00 |
|
markus
|
7dbb2cc632
|
comment out breaks-option because of lacking model capability
|
2020-11-06 13:50:37 +01:00 |
|
markus
|
da95cedb4d
|
change air_type to mechanical_ventilation_type
|
2020-11-06 13:50:15 +01:00 |
|
Nicolas Mounet
|
314a29d271
|
HEPA addition now fully supported in model_generator.py
|
2020-11-06 13:41:06 +01:00 |
|
Nicolas Mounet
|
2710daacd7
|
Clarifying the use of HVAC (instead of HEPA) or manual air change, in model_generator (transparent change)
|
2020-11-06 13:37:46 +01:00 |
|
Nicolas Mounet
|
4ce57f6491
|
Adding hepa_option in FormData class (model_generator.py)
|
2020-11-06 13:32:40 +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
|
11feee4050
|
create sets of valid values
|
2020-11-06 12:57:21 +01:00 |
|
markus
|
d5d572c943
|
add test_key_validation
|
2020-11-06 12:36:53 +01:00 |
|
Philip James Elson
|
5a64291f2b
|
Merge branch 'mechanical-ventilation-type' into 'master'
add mechanical_ventilation_type
See merge request cara/cara!36
|
2020-11-06 11:17:02 +00:00 |
|
markus
|
7cd4e4ac85
|
de-capitalize activity_dict
|
2020-11-06 12:13:01 +01:00 |
|
markus
|
25c1704e43
|
add mechanical_ventilation_type
|
2020-11-06 12:09:18 +01:00 |
|
Philip James Elson
|
1a14d3bc0f
|
Merge branch 'feature/scenario_graph' into 'master'
Include a scenario graph in the report
See merge request cara/cara!34
|
2020-11-06 10:20:03 +00:00 |
|
Phil Elson
|
0f2f306ff3
|
Include a scenario graph in the report.
|
2020-11-06 11:17:11 +01:00 |
|
Philip James Elson
|
d9b880d056
|
Merge branch 'develop/form_report-UI' into 'master'
Updates to form and report UI
See merge request cara/cara!33
|
2020-11-06 10:11:41 +00:00 |
|
gaazzopa
|
ffbe292329
|
Minor changes
|
2020-11-06 10:33:38 +01:00 |
|
gaazzopa
|
987c0d048e
|
Updated report presentation of various fields
|
2020-11-06 10:24:15 +01:00 |
|
Philip James Elson
|
4551e51b98
|
Merge branch 'ventilation-calc' into 'master'
Ventilation calc
See merge request cara/cara!32
|
2020-11-06 09:08:13 +00:00 |
|
Phil Elson
|
56124c552b
|
Normalize the input activity.
|
2020-11-06 10:06:29 +01:00 |
|
markus
|
4e7d341ae8
|
multiply air_changes by room_volume
|
2020-11-06 10:05:15 +01:00 |
|
markus
|
a2512e2798
|
add test_ventilation
|
2020-11-06 10:05:15 +01:00 |
|
markus
|
978402c701
|
change default window periodicity
|
2020-11-06 10:05:15 +01:00 |
|
markus
|
61ab69b41f
|
fix typo
|
2020-11-06 10:05:15 +01:00 |
|
markus
|
7860ae6074
|
transition from dictionary to FormData
|
2020-11-06 10:05:15 +01:00 |
|
markus
|
6c2a843e67
|
move ventilation to dedicated function and use piecewise temperature function
|
2020-11-06 10:05:15 +01:00 |
|
gaazzopa
|
9cb29eb16e
|
Updated form UI to enable event data always
|
2020-11-06 09:32:52 +01:00 |
|
Philip James Elson
|
6af1f19d66
|
Merge branch 'dev/report-form' into 'master'
Updates to report form
See merge request cara/cara!28
|
2020-11-05 23:09:33 +00:00 |
|
gaazzopa
|
881669ab09
|
Updated report to use form values
|
2020-11-06 00:07:17 +01:00 |
|
gaazzopa
|
0f415abad9
|
Added disclaimer to report
|
2020-11-06 00:04:36 +01:00 |
|
gaazzopa
|
f19d76589c
|
Updated report display
|
2020-11-06 00:04:36 +01:00 |
|
Philip James Elson
|
584a944452
|
Merge branch 'fix/nginx-app' into 'master'
Avoid trying to optimise static serving of the calculator app
See merge request cara/cara!31
|
2020-11-05 23:01:59 +00:00 |
|
Phil Elson
|
0c4d47910c
|
Avoid trying to optimise static serving of the calculator app, since the nginx configuration doesn't read symlinks anyway.
|
2020-11-05 23:57:18 +01:00 |
|
Philip James Elson
|
400f520e02
|
Merge branch 'feature/running-calculator-webservice' into 'master'
Enable the cara-webservice in the Openshift deployment.
See merge request cara/cara!27
|
2020-11-05 22:30:36 +00: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 |
|
Philip James Elson
|
79b5e03418
|
Merge branch 'fix/integration_of_piecewise_constant_and_calc' into 'master'
Fix to use the updated PiecewiseConstant scheme for temperatures
See merge request cara/cara!30
|
2020-11-05 22:23:42 +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 |
|
Phil Elson
|
41ce4112d1
|
Enable the cara-webservice in the Openshift deployment.
|
2020-11-05 23:01:26 +01:00 |
|
Nicolas Mounet
|
8c6e01e7b6
|
Make sure to output a set for transition_times (models.py)
|
2020-11-05 22:16:03 +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
|
2790e6b1aa
|
Simplifying WindowOpening transition_times from temperature (in line with comment on Merge request 19 - see https://gitlab.cern.ch/cara/cara/-/merge_requests/19#note_3928329)
|
2020-11-05 21:47:44 +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 |
|
Philip James Elson
|
2d69c7bfa8
|
Merge branch 'UI-formalities' into 'master'
UI formalties and updates
See merge request cara/cara!25
|
2020-11-05 19:55:34 +00:00 |
|
Nicolas Mounet
|
869758ce0d
|
Adding MultipleVentilation class
|
2020-11-05 20:50:58 +01:00 |
|
Nicolas Mounet
|
e7e54cd129
|
Fixing docstring of Ventilation class
|
2020-11-05 20:50:36 +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 |
|