markus
|
48e0b9d6cc
|
update test
|
2020-11-11 11:35:28 +01:00 |
|
markus
|
550a5821ab
|
Add tabs to interface
|
2020-11-11 11:34:15 +01:00 |
|
Philip James Elson
|
30dc63fc1b
|
Merge branch 'develop/expert_app_ventilation_temp' into 'master'
Improving expert app - choice of temperature/month
See merge request cara/cara!77
|
2020-11-11 09:31:41 +00:00 |
|
Nicolas Mounet
|
360d8c6645
|
expert app: hepa -> mechanical; minor changes in code formatting
|
2020-11-11 10:29:10 +01:00 |
|
Nicolas Mounet
|
5e6dd424ba
|
Merge branch 'patch-1' into 'master'
Add important details to the user for HEPA filtration values in this "How to use the tool" block.
See merge request cara/cara!76
|
2020-11-11 08:33:59 +00:00 |
|
Nicolas Mounet
|
6d1085bd2b
|
Adding mask to exposed in expert app
|
2020-11-11 09:27:23 +01:00 |
|
Nicolas Mounet
|
06368bcb46
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/expert_app_ventilation_temp
|
2020-11-11 09:13:44 +01:00 |
|
Andre Henriques
|
56134eafbe
|
correct typo
|
2020-11-11 08:12:47 +00:00 |
|
Andre Henriques
|
e48495f190
|
Add important details to the user for HEPA filtration values in this "How to use the tool" block.
|
2020-11-11 08:09:59 +00:00 |
|
Nicolas Mounet
|
8de32544d5
|
Merge branch 'feature/report-repeated-events' into 'master'
Separate the exposed from the infected activities
See merge request cara/cara!74
|
2020-11-11 07:40:21 +00:00 |
|
Nicolas Mounet
|
775339cdad
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/expert_app_ventilation_temp
|
2020-11-10 21:10:37 +01:00 |
|
Philip James Elson
|
3a3358aa6d
|
Merge branch 'feature/new_input_options' into 'master'
Added new input options
Closes #68, #75, #55, and #81
See merge request cara/cara!75
|
2020-11-10 18:57:30 +00:00 |
|
gaazzopa
|
211ec92ada
|
HEPA min value is 0
|
2020-11-10 17:55:36 +01:00 |
|
gaazzopa
|
ef65039cad
|
Fixed label ID in form
|
2020-11-10 17:48:43 +01:00 |
|
Phil Elson
|
a9221c558b
|
Implement an emission_rate_when_present method on InfectedPopulation, so that we don't have to keep guessing a time when they are present.
|
2020-11-10 17:25:19 +01:00 |
|
gaazzopa
|
ec6ef6a156
|
Bumped up version and centralised version setting
|
2020-11-10 17:19:30 +01:00 |
|
Phil Elson
|
7b43eb0ea5
|
Rename Model to ConcentrationModel.
|
2020-11-10 17:19:19 +01:00 |
|
gaazzopa
|
824ad5886b
|
Added HEPA amount to model and report
|
2020-11-10 17:08:07 +01:00 |
|
gaazzopa
|
1cc73d4fbc
|
Added HEPA amount option to form
|
2020-11-10 16:59:05 +01:00 |
|
Phil Elson
|
200e7cb14b
|
Apply ExposureModel to both the expert and calculator apps.
|
2020-11-10 16:46:35 +01:00 |
|
gaazzopa
|
154754000e
|
Fixed mask type in baseline model
|
2020-11-10 16:44:03 +01:00 |
|
gaazzopa
|
7af010d2f5
|
Added debug option in form
|
2020-11-10 16:33:23 +01:00 |
|
gaazzopa
|
5e26e0196e
|
Added mask option and fixed display in report
|
2020-11-10 16:32:34 +01:00 |
|
Phil Elson
|
43da2d7521
|
Implement exposed activity/mask wearing independently of the infected group.
|
2020-11-10 15:45:39 +01:00 |
|
Nicolas Mounet
|
f348a0c7c5
|
Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/expert_app_ventilation_temp
|
2020-11-10 09:19:11 +01:00 |
|
Philip James Elson
|
050c9fd9ba
|
Merge branch 'develop/refine_time_mesh_for_temp' into 'master'
Refine the time mesh for Geneva temperatures
Closes #72
See merge request cara/cara!70
|
2020-11-10 07:33:31 +00:00 |
|
Philip James Elson
|
a11762eb73
|
Merge branch 'develop/form-updates' into 'master'
Updates to UI form
Closes #69 and #64
See merge request cara/cara!72
|
2020-11-10 06:30:23 +00:00 |
|
Nicolas Mounet
|
f5f7eea084
|
Adding choice of temperature (including hourly time-dependence) in expert app
|
2020-11-09 20:57:01 +01:00 |
|
Nicolas Mounet
|
4f502b4b55
|
Expert app: HEPA -> Mechanical; starting time scale at first presence time; minor change in temperatures and in y scale
|
2020-11-09 20:54:20 +01:00 |
|
gaazzopa
|
e7d9ba96c8
|
Office option interchangeable with meeting
|
2020-11-09 20:02:04 +01:00 |
|
gaazzopa
|
79ca14d088
|
Added report html title
|
2020-11-09 19:58:18 +01:00 |
|
gaazzopa
|
0b608ebc5d
|
Finish time must be after start time
|
2020-11-09 19:55:06 +01:00 |
|
Nicolas Mounet
|
6dacddedbe
|
Improve readability of tests; adding 2 end-to-end tests (on infection probability)
|
2020-11-09 18:32:56 +01:00 |
|
Nicolas Mounet
|
ddbfbf2631
|
GenevaTemperatures refined in the proper way in data.py
|
2020-11-09 17:22:15 +01:00 |
|
Nicolas Mounet
|
e63b4c9e6a
|
Adding cara/data.py (forgotten in previous commit)
|
2020-11-09 17:17:03 +01:00 |
|
Nicolas Mounet
|
c264e6bfc2
|
Moving Geneva temperature from cara/models.py to cara/data.py
|
2020-11-09 17:11:26 +01:00 |
|
Nicolas Mounet
|
87c2a9bebd
|
Adding refine method (with linear interpolation) in PiecewiseConstant class
|
2020-11-09 16:08:58 +01:00 |
|
Nicolas Mounet
|
d56731cebc
|
Adding a test of the interpolation in the PiecewiseConstant.refine method
|
2020-11-09 16:02:11 +01:00 |
|
Andre Henriques
|
4bc097686c
|
Merge branch 'patch-1' into 'master'
Update README.md
See merge request cara/cara!69
|
2020-11-09 13:01:59 +00:00 |
|
Andre Henriques
|
15529f18e7
|
Update README.md
|
2020-11-09 13:01:58 +00:00 |
|
Nicolas Mounet
|
225324cc5b
|
Changing default mesh of temperatues to one point every 6 minutes (Geneva temperature)
|
2020-11-09 12:39:16 +01:00 |
|
Nicolas Mounet
|
5a5de009bc
|
Adding a test to that a finer mesh has no impact in itself
|
2020-11-09 12:37:40 +01:00 |
|
Philip James Elson
|
44b1c60ab5
|
Merge branch 'writteninstructions' into 'master'
Detailed user instructions
See merge request cara/cara!67
|
2020-11-09 10:18:25 +00:00 |
|
Phil Elson
|
d02375c2e3
|
Reference the new calculator guide in the main README.
|
2020-11-09 11:16:20 +01:00 |
|
Phil Elson
|
c368ad4856
|
Renamed calculator user-guide, and broke sentences into lines for ease of maintenance.
|
2020-11-09 11:16:05 +01:00 |
|
James Devine
|
f94471f31a
|
Detailed user instructions
|
2020-11-09 10:55:39 +01:00 |
|
Nicolas Mounet
|
ca7f8745aa
|
Merge branch 'feature/n_windows' into 'master'
Allow WindowOpening to have more than one window of the given dimensions.
See merge request cara/cara!68
|
2020-11-09 08:51:10 +00:00 |
|
Phil Elson
|
8f973136e0
|
Allow WindowOpening to have more than one window of the given dimensions.
|
2020-11-09 09:43:47 +01:00 |
|
Philip James Elson
|
9f770b0887
|
Merge branch 'upstream/pizzazz2' into 'master'
Put the calculator form inside the CARA template.
See merge request cara/cara!66
|
2020-11-09 07:36:36 +00:00 |
|
Phil Elson
|
2b8f44b7dd
|
Use the new layout template for both the form and the index page.
|
2020-11-07 12:15:23 +01:00 |
|