Commit graph

1123 commits

Author SHA1 Message Date
Luis Aleixo
b7276d4714 updated width 2021-08-18 15:45:53 +02:00
Luis Aleixo
cbc5ffb203 added methods to different scenarios 2021-08-18 14:23:46 +02:00
Luis Aleixo
8ff84963f2 added html2pdf property 2021-08-18 12:17:01 +02:00
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
Philip James Elson
fe04e201f1 Merge branch 'update/d3plot' into 'master'
Update d3 plot units and title - missing from previous MRs

See merge request cara/cara!244
2021-08-12 07:52:35 +00:00
Andre Henriques
277044473c Update the plots in the report to show virons / m³, following on from !236. 2021-08-12 07:52:34 +00:00
Phil Elson
d1833955dd Choose the times to sample in the report more wisely. 2021-08-10 16:59:47 +02:00
Nicolas Mounet
559ac2723f Merge branch 'feature/higher_resolution_temperature' into 'master'
Restore the outside temperature data to a 6 minute resolution

See merge request cara/cara!212
2021-08-06 17:04:03 +00:00
Philip James Elson
eafa8331bc Merge branch 'feature/plotting_d3' into 'master'
Correct the yrange calculation in the report concentration plot

Closes #183 and #187

See merge request cara/cara!240
2021-08-06 15:21:49 +00:00
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
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
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
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