Commit graph

1398 commits

Author SHA1 Message Date
Phil Elson
a1000eb3ec First steps towards making the form reponsive to screensize. 2021-05-04 07:08:35 +02:00
Nicolas Mounet
94d01104d0 Using concentration_limit method in concentration (ConcentrationModel) 2021-05-04 06:43:27 +02:00
Nicolas Mounet
68893f905f Merge branch 'master' of https://gitlab.cern.ch/cara/cara into develop/time_dependence_concentration_model 2021-05-04 06:37:00 +02:00
Philip James Elson
9e3adf30b0 Merge branch 'feature/model_vectorisation_pt3' into 'master'
Vectorise ExposureModel

See merge request cara/cara!163
2021-05-04 04:31:46 +00:00
Nicolas Mounet
99c0e4e1f8 Extending vectorised tests to expected_new_cases 2021-05-04 05:57:21 +02:00
Andre Henriques
54ad996d0b Merge branch 'feature/docker-calculator' into 'master'
Add a dockerfile and details of how to run it

See merge request cara/cara!171
2021-05-03 21:03:02 +00:00
Nicolas Mounet
c3cf37d3da Simplifying test_exposure_model (towards unit tests rather than integration tests) 2021-05-03 22:22:25 +02:00
Phil Elson
178ee72fe3 Add a dockerfile and details of how to run it. 2021-05-03 20:10:44 +02:00
Andre Henriques
0422132d65 Merge branch 'readme_citation_style' into 'master'
typo in heading style

See merge request cara/cara!170
2021-05-03 15:13:50 +00:00
Andre Henriques
a3ad121f71 typo in heading style 2021-05-03 15:11:45 +00:00
Nicolas Mounet
2e928b5fef Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/model_vectorisation_pt3 2021-05-03 17:09:54 +02:00
Philip James Elson
f0d8da7361 Merge branch 'author_citation' into 'master'
Add authorship and citation to README.md

See merge request cara/cara!169
2021-05-03 14:28:24 +00:00
Philip James Elson
e02396514e Merge branch 'develop/hours2time_in_concentration_plot' into 'master'
Better xtick labels in concentration plots

See merge request cara/cara!165
2021-05-03 14:27:30 +00:00
Nicolas Mounet
26d7ef9f5d Replacing the use of hours2timestring by datetimes, in the x-axis of the plots generated in report_generator 2021-05-03 14:27:29 +00:00
Andre Henriques
54b2fc96ef add NTNU for Markus 2021-05-03 13:03:49 +00:00
Nicolas Mounet
8b1571dcf1 Exposing concentration_limit in ConcentrationModel 2021-05-03 15:01:42 +02:00
Nicolas Mounet
d0ef2f13c9 Adding test on concentration limit in concentration model 2021-05-03 15:01:02 +02:00
Andre Henriques
7abd6dd65b Add authorship and citation to README.md 2021-05-03 12:57:47 +00:00
Andre Henriques
99152f7e44 Merge branch 'fix/license_headers' into 'master'
Compromise on the header information added to key files

See merge request cara/cara!168
2021-05-03 12:46:21 +00:00
Phil Elson
05dffa3f50 Compromise on the header information added to key files, ensuring that the details are correct, but are canonically defined in one place. 2021-05-03 13:46:03 +02:00
Phil Elson
d1f22a03a7 Re-instate all error handling details from #117. 2021-05-03 13:40:15 +02:00
Andre Henriques
58006ebe5f Merge branch 'feature/OSS_license' into 'master'
Prepare the repository for an Apache 2.0 license

See merge request cara/cara!161
2021-05-03 11:38:43 +00:00
Gabriella Azzopardi
5a6711be3e Merge branch 'feature/md_text_blocks' into 'master'
Implement common markdown blocks infrastructure

See merge request cara/cara!166
2021-05-03 11:33:18 +00:00
Philip James Elson
49c28aaa98 Implement common markdown blocks infrastructure 2021-05-03 11:33:17 +00:00
Nicolas Mounet
b622283206 In concentration model, compute infectious virus removal rate only at time of next state change, to make sure it stays constant 2021-05-03 12:35:10 +02:00
Nicolas Mounet
307cf13bfa Adding a test to check that infectious virus removal rate is computed only at the time of a state change 2021-05-03 12:30:00 +02:00
Nicolas Mounet
6511ac1c4f Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/model_vectorisation_pt3 2021-04-30 11:57:54 +02:00
Andre Henriques
bef6602cc1 Merge branch 'link-cara-parameters' into 'master'
Update userguide with link to existing cara parameters

Closes #158

See merge request cara/cara!164
2021-04-29 22:05:22 +00:00
Andre Henriques
b79440512d Update userguide with link to existing cara parameters 2021-04-29 22:05:21 +00:00
Phil Elson
93d91e0d4d Review actions. 2021-04-29 23:56:33 +02:00
Phil Elson
5eb87372be Update the pages based on the open source requirements. 2021-04-29 23:56:33 +02:00
Phil Elson
597a27eadc Prepare the repository for an Apache 2.0 license. 2021-04-29 23:56:33 +02:00
Nicolas Mounet
ac8e912579 Proper typing in HVACMechanical and HEPAFilter classes 2021-04-29 09:13:57 +02:00
Nicolas Mounet
dc6ea75058 Adding hepa and hvac vectorisation tests 2021-04-29 09:09:37 +02:00
Nicolas Mounet
87e52ddf66 Harmonizing ventilation tests capitalization 2021-04-29 08:45:55 +02:00
Nicolas Mounet
6ba0ee5f8c Merge branch 'master' of https://gitlab.cern.ch/cara/cara into feature/model_vectorisation_pt3 2021-04-29 07:01:25 +02:00
Nicolas Mounet
2d00bc859f Merge branch 'feature/model_vectorisation_pt2' into 'master'
Vectorise PiecewiseConstant and WindowOpenings

See merge request cara/cara!159
2021-04-29 04:35:10 +00:00
Phil Elson
8654cd5ed9 Review actions for vectorisation. 2021-04-28 20:10:35 +02:00
Nicolas Mounet
8e0d9d0b1e adding a test on exposure model, to check scalar vs vector 2021-04-28 18:05:14 +02:00
Nicolas Mounet
c6c03888f7 test on exposure model more modular 2021-04-28 16:40:42 +02:00
Nicolas Mounet
dd236a936a Adding _VectorisedFloat types in ExposureModel outputs and for eta_inhale of Mask 2021-04-28 14:22:23 +02:00
Nicolas Mounet
487c930f8f Dealing with vectorised concentrations in exposure model 2021-04-28 14:20:13 +02:00
Nicolas Mounet
5afa228fb5 Adding exposure model vectorisation test 2021-04-28 14:18:36 +02:00
Nicolas Mounet
b5d6ce974f Adding test for InfectedPopulation class (Vectorisation) 2021-04-28 11:50:08 +02:00
Philip James Elson
2a43eea709 Merge branch 'feature/shorter_url' into 'master'
Clean up the FormData defaults and casting rules

Closes #143

See merge request cara/cara!155
2021-04-21 14:07:52 +00:00
Philip James Elson
48b9c91f43 Clean up the FormData defaults and casting rules. Using this information we now shorten the FormData dictionary. The baseline form URL is now 490 characters compared to 1089 previously. Closes #143. 2021-04-21 14:07:50 +00:00
Philip James Elson
da5cbc6891 Merge branch 'feature/configurable_reports' into 'master'
Allow theming of CARA (initially in the report only, to be extended later on)

Closes #157

See merge request cara/cara!160
2021-04-21 14:06:09 +00:00
Phil Elson
cffbff0305 Fix the badly floating QR text, and address the extends vs implement comment for theme templates. 2021-04-16 21:09:22 +02:00
Phil Elson
14ca6d3b38 Restore the disclaimer in the base, but extend it in the CERN theme. 2021-04-15 21:53:26 +02:00
Phil Elson
9a17121d9e Allow theming of CARA (initially in the report only, to be extended later on). 2021-04-15 13:46:46 +02:00