pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
955 commits 24 branches 13 tags 17 MiB
Commit graph

955 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phil Elson
eaefa515eb Restore the outside temperature data to a 6 minute resolution for improved smoothness of the presented results. 2021-08-06 12:01:58 +02:00
Nicolas Mounet
ad97a6b18c Merge branch 'optimisation/better_concentration_caching' into 'master' 
Optimisation: Improve the caching of concentration(time) calls by ensuring that floats are used throughout the cara codebase when representing time

See merge request cara/cara!238
 2021-08-06 09:53:50 +00:00
Phil Elson
9546c1966c Rename _concentration_at_state_change to _concentration_cached. 2021-08-06 11:50:06 +02:00
Phil Elson
aa269aaf6e Use floats throughout the cara codebase to represent time. 2021-08-06 10:39:41 +02:00
Philip James Elson
e1d8b3a2c8 Merge branch 'feature/virology_parameters' into 'master' 
ER and P(I) formulas update according to qID parameter

Closes #184

See merge request cara/cara!236
 2021-08-06 08:24:28 +00:00
Luis Aleixo
acbf676a28 Remove the concept of quanta in the model, focusing instead on virons. 2021-08-06 08:24:25 +00:00
Philip James Elson
e3e49b5de7 Merge branch 'feature/plotting_d3' into 'master' 
Feature/plotting time vs concentration using d3 library

Closes #183

See merge request cara/cara!233
 2021-08-06 08:18:40 +00:00
Luis Aleixo
acf14c05cd Use d3 for the concentration line plot in the report 2021-08-06 08:18:40 +00:00
Andre Henriques
5e781bbb4b Merge branch 'lrdossan-master-patch-47603' into 'master' 
Attribute Luis' contribution

See merge request cara/cara!237
 2021-08-05 14:24:52 +00:00
Luis Aleixo
077737b2cb Update index.html.j2 with luis' contribution 2021-08-05 14:07:22 +00:00
Luis Aleixo
cc4fb7cd3a Update luis' contribuion on README 2021-08-05 14:06:14 +00:00
Luis Aleixo
9f48be9840 Update README.md 2021-08-04 13:21:16 +00: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
Phil Elson
6aca5164c1 Increment the major version of the CARA model and the calculator. 2021-07-13 13:02:28 +02:00
Philip James Elson
6802fbd737 Merge branch 'fix/revert-multiprocessing' into 'master' 
Revert the multiprocessing change from #214.

See merge request cara/cara!219
 2021-07-13 10:24:27 +00:00
Phil Elson
13973bd61b Revert the multiprocessing change from #214. 2021-07-13 12:22:14 +02:00
Philip James Elson
9fd04828d9 Merge branch 'feature/logout_functionality' into 'master' 
Logout redirect link updated to "/auth/logout"

Closes #140

See merge request cara/cara!218
 2021-07-13 10:07:43 +00:00
Philip James Elson
952078c3c0 Merge branch 'fix-docker-compose' into 'master' 
Fix QR code redirection for calculator-cern

Closes #177

See merge request cara/cara!215
 2021-07-13 10:07:17 +00:00
Luis Aleixo
694951d639 logout redirect link updated to "/auth/logout" fixes #140 2021-07-13 11:57:37 +02:00