Commit graph

983 commits

Author SHA1 Message Date
Andrejh
4d95dd2ced add data for talking 2021-08-18 10:18:11 +02:00
Andrejh
9e04e2e2f2 update markers and labels 2021-08-18 10:04:40 +02:00
Andrejh
93662ad875 change to 100% breathing 2021-08-18 09:45:41 +02:00
Andrejh
c60f363726 Merge remote-tracking branch 'origin/feature/virions_plot' into feature/virions_plot 2021-08-18 09:32:39 +02:00
Andrejh
5ee92afbe1 update labels 2021-08-18 09:31:55 +02:00
Luis Aleixo
68e7c1c13d updated requirements 2021-08-17 15:51:46 +02:00
Luis Aleixo
0350b1e8e6 plot legend with titles 2021-08-17 11:12:39 +02:00
Luis Aleixo
158320e522 added labels to each author 2021-08-16 17:44:29 +02:00
Luis Aleixo
0a2fc3ef17 added cluster areas 2021-08-16 15:49:33 +02:00
Luis Aleixo
b2d794316a Merge branch 'master' into feature/virions_plot 2021-08-06 11:41:55 +02:00
Luis Aleixo
f5ee4c3882 updated Yan data 2021-08-06 11:36:23 +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
Andrejh
60cb0ef455 update plot labels 2021-08-06 09:55:37 +02:00
Luis Aleixo
d33affa36f added points from file into the plot 2021-08-05 17:39:57 +02: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
8daa03881c deleted unused file 2021-08-05 15:28:06 +02:00
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
9f48be9840 Update README.md 2021-08-04 13:21:16 +00: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