Luis Aleixo
e7decf52b2
update report_generator according to previous version
2021-08-05 15:11:28 +02:00
Luis Aleixo
81dcbcd39e
file used to plot and write data
2021-08-05 15:10:21 +02:00
Luis Aleixo
2988f2085b
files division
2021-08-05 14:40:08 +02:00
Luis Aleixo
90040a62a2
plot with log scale on y axis
2021-08-05 13:40:57 +02:00
Luis Aleixo
ae085826dd
plot fig
2021-08-05 09:58:22 +02:00
Luis Aleixo
d03ff7f4f0
added model_scenario
2021-08-05 09:41:01 +02:00
Luis Aleixo
b59ae0236d
tab missing
2021-08-04 14:16:48 +02:00
Luis Aleixo
f614027b02
test_exposure_model values adjustments
2021-08-04 14:07:01 +02:00
Luis Aleixo
5ddddf10f8
Changed 'infectious virus' to 'virions'
2021-08-04 13:36:52 +02:00
Luis Aleixo
415ade0185
single test for infectious_dose_vectorisation fix #184
2021-08-04 11:43:58 +02:00
Luis Aleixo
160dcf6a60
test_infectious_dose_vectorisation code implementation
2021-08-04 09:59:04 +02:00
Luis Aleixo
c1938889b8
test_infected_population_vectorisation and test_concentration_model_vectorisation tests fix
2021-08-03 16:11:59 +02:00
Luis Aleixo
9a43db9c5a
other variable names
2021-08-03 15:33:40 +02:00
Luis Aleixo
4b63281f02
test update with new values
2021-08-03 15:27:28 +02:00
Luis Aleixo
f6340d7986
added logic behing ER and concentration (model)
2021-08-03 13:45:14 +02:00
Luis Aleixo
0935056df2
variable renaming (remove quantum)
2021-08-03 11:22:08 +02:00
Luis Aleixo
52c4eb7c2c
Revert "variables renaming (removal of quantum)"
...
This reverts commit ae4db5a4b0 .
2021-08-03 11:18:44 +02:00
Luis Aleixo
ae4db5a4b0
variables renaming (removal of quantum)
2021-08-03 11:10:57 +02:00
Philip James Elson
2645ff2a43
Merge branch 'feature/check-oc-config-prod' into 'master'
...
Align the dev and prod openshift configs, and validate that they remain correct
See merge request cara/cara!230
2021-07-31 04:04:23 +00:00
Philip James Elson
ec724a5a3f
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Fix the expert app, as the new docker image did not support running as non-root
See merge request cara/cara!235
2021-07-30 15:57:43 +00:00
Phil Elson
af3fe421db
Fix the expert app, as the new docker image did not support running as non-root.
2021-07-30 17:53:19 +02:00
Philip James Elson
7855e45676
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Update the public container image to use Python 3.9
See merge request cara/cara!232
2021-07-30 08:53:32 +00:00
Phil Elson
3ef00c8312
Update the public container image to use Python 3.9 also.
2021-07-30 10:51:30 +02:00
Philip James Elson
67d0281c98
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Move the expert app into the cara package
See merge request cara/cara!231
2021-07-30 08:48:13 +00:00
Phil Elson
e1392fb8ce
Move the expert app into the cara package. Helps with convenient access from the cara-webservice image.
2021-07-30 10:45:24 +02:00
Philip James Elson
ca2bbd8340
Merge branch 'feature/py39-cara-webservice' into 'master'
...
Create a Python3.9 based Dockerfile for cara to run on openshift
See merge request cara/cara!229
2021-07-30 08:17:40 +00:00
Phil Elson
5350845852
Align the dev and prod openshift configs, and validate that they remain correct.
2021-07-30 09:47:32 +02:00
Nicola Tarocco
f7ce8c96f3
Continue to allow a relative path to be specified for the theme directory.
2021-07-30 08:55:19 +02:00
Phil Elson
3103663978
Create a Python3.9 based Dockerfile for cara to run on openshift.
2021-07-30 08:53:06 +02:00
Philip James Elson
234ca99d28
Merge branch 'feature/ci-checking-openshift-config' into 'master'
...
Add CI to validate the test-cara openshift configuration
See merge request cara/cara!223
2021-07-30 06:51:43 +00:00
Phil Elson
a2fd0e7fe5
Update to reflect the resource limit changes in cara-webservice.
2021-07-29 14:49:52 +02:00
Phil Elson
aeeb68cc09
Enable the config checker.
2021-07-29 10:04:53 +02:00
Phil Elson
74ee8b5241
Implement the normalisation and comparison of openshift config items
2021-07-29 09:38:59 +02:00
Phil Elson
b74ffebeb2
Tool to generate the config from the templates.
2021-07-29 09:38:59 +02:00
Phil Elson
91ea826060
Add a CI job to validate the test-cara instance.
2021-07-29 09:38:59 +02:00
Nicolas Mounet
43fd580ac2
Merge branch 'feature/py39' into 'master'
...
Add support, and CI for Python 3.9
See merge request cara/cara!228
2021-07-28 12:31:51 +00:00
Phil Elson
7109c821e8
Add support, and CI for Python 3.9
2021-07-28 11:17:45 +02:00
Nicola Tarocco
145509ba68
Merge branch 'feature/docker-builds' into 'master'
...
Build the auth-service through a Dockerfile (and move to py39)
See merge request cara/cara!226
2021-07-21 15:27:39 +00:00
Phil Elson
2fcadc7952
Add auth-service building to the CI.
2021-07-20 11:14:08 +02:00
Phil Elson
d7199f7a15
Build the auth-service through a Dockerfile to allow us to use the latest versions of libraries (e.g. python 3.9)
2021-07-20 11:06:07 +02:00
Andre Henriques
74586f70b1
Merge branch 'feature/scale-warning' into 'master'
...
CERN Covid scale update - yellow level 2
See merge request cara/cara!225
2021-07-19 14:55:09 +00:00
Luis Aleixo
918149e4c7
CERN Covid scale update - yellow level 2
2021-07-19 16:43:28 +02:00
Andre Henriques
3fbb953246
Merge branch 'feature/percentage_precision' into 'master'
...
Change % format for P(i)
See merge request cara/cara!222
2021-07-18 21:41:56 +00:00
Nicola Tarocco
99396fd7b1
Merge branch 'feature/parallelism_strikes_back' into 'master'
...
Re-introduce parallelism through loky
See merge request cara/cara!224
2021-07-16 13:29:42 +00:00
Phil Elson
77e9215812
Re-introduce parallelism through loky.
2021-07-16 13:56:28 +02:00
Philip James Elson
b21a387053
Merge branch 'feat/run-from-docker' into 'master'
...
Update the openshift templates to better reflect the deployed state of test-cara
See merge request cara/cara!221
2021-07-16 08:57:05 +00:00
jdevine
967127384f
Changed % responses for P(i), now given as 0.1f (1 decimal place, unless <1 then 2dp as previously)
...
Modified alternative scenarios:
- The base case is no longer added to alternate scenarios
- HEPA/FFP2 options revised to make more sense
If using FFP2, no alternatives are added.
If using HEPA and FFP2, HEPA + Type 1 is included as an alternate
If using HEPA and Type I, HEPA + FFP2 is included as an alternate
2021-07-14 18:20:25 +02:00
Phil Elson
7d14bc488f
Tests passing for OpenShift config checking on the test-cara instance.
2021-07-14 13:32:02 +02:00
Andre Henriques
29a39040a5
Merge branch 'feature/scale-warning' into 'master'
...
Feature/scale warning
Closes #171 and #173
See merge request cara/cara!213
2021-07-13 13:02:02 +00:00
Gabriella Azzopardi
a966a03dd1
Merge branch 'maint/major_cara_version_update' into 'master'
...
Increment the major version of the CARA model and the calculator.
See merge request cara/cara!220
2021-07-13 11:14:41 +00:00