Commit graph

1083 commits

Author SHA1 Message Date
Luis Aleixo
825216c983 Correct the yrange calculation in the report concentration plot 2021-08-06 15:21:48 +00:00
Nicolas Mounet
feef402674 Merge branch 'optimisation/tactical-caching' into 'master'
Introduce some further caching for performance gains

See merge request cara/cara!241
2021-08-06 13:38:37 +00:00
Phil Elson
3206a069a0 After review under snakeviz, introduce some further caching for performance gains. 2021-08-06 15:32:01 +02:00
Nicolas Mounet
c745823768 Merge branch 'optimisation/last_state_change_bisection' into 'master'
Use bisection method to compute the last state change for improved performance

See merge request cara/cara!239
2021-08-06 13:25:16 +00:00
Phil Elson
f22ba928e0 Ensure that 0 is always one of the state change times. 2021-08-06 15:17:37 +02:00
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
Phil Elson
06b606f3fa Remove the unused _is_interval_between_state_changes method. 2021-08-06 11:57:00 +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
0e71ace0d9 Implement bisection algorithm for finding the most recent state change. 2021-08-06 11:52:14 +02:00
Phil Elson
43b9b864af Improve the testing of ConcentrationModel.last_state_change 2021-08-06 11:52:14 +02: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
Luis Aleixo
57b91fccdb cern yellow warning bug fix 2021-08-04 10:56:24 +02:00
Luis Aleixo
c111cb6454 results component vertically aligned 2021-08-04 10:46:26 +02:00
Luis Aleixo
5f652a8edc bug with Applicable rules tab solved 2021-08-04 10:29:20 +02:00
Luis Aleixo
b9143727a0 text-size larger and qr code expanded 2021-08-04 10:21:07 +02:00
Luis Aleixo
5523fe28dc Input data with different cards and min height for animation css 2021-08-02 17:18:01 +02:00
Luis Aleixo
bb968e58e6 added correct colors for warning animation 2021-08-02 14:07:13 +02:00
Luis Aleixo
75ae089f55 Alternative scenarios collapse tab start "closed" 2021-08-02 11:44:48 +02:00
Luis Aleixo
38a68e2da5 New tab added - report preamble 2021-08-02 11:41:25 +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
Luis Aleixo
4d7be0339c deleted images not in usage 2021-07-30 15:37:40 +02:00
Luis Aleixo
3b7959a01d added bootstrap animation to percentage of infection 2021-07-30 15:37:04 +02:00
Luis Aleixo
c8270aee79 Collapsible sections order changed 2021-07-30 14:30:12 +02:00
Luis Aleixo
f7eda612f8 Merge branch 'master' into feature/report_reformulation 2021-07-30 12:45:23 +02:00
Luis Aleixo
ceadd9e70d Removed animation for covid-scale 2021-07-30 12:21:01 +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