Skip to content

Commit ffcc647

Browse files
authoredFeb 1, 2022
More comprehensive seeding and vaccine schedules (#223)
* Add option for vaccinate_schedule to take a recurring or list schedule Add tests for single action, multi-day, recurring and bespoke list vaccine schedules * Allow Vaccine to be initiated with a MetaModel * Add vaccines to the MetaModel Basic version of vaccinate_schedule which allows the same schedule for all regions * Inter-region migration infections are proportional to the tranmission_multipler of the strain * Add pool transfers for central London regions where most infections are between other regions (i.e. 2 commuters) * In MetaModel, extend vaccine schedule to work on a per region basis * Additions to MetaModel plot function Allow for a base_date to be given for date instead of time on x-axis Allow strain speicific infecitons to be plotted Allow for a denominator to be given so % of strain can be plotted * Additions to MetaModel plot function Allow for a base_date to be given for date instead of time on x-axis Allow strain speicific infecitons to be plotted Allow for a denominator to be given so % of strain can be plotted * Don't add seed_infections to total infected at the point they are infected Leads to discrepancy with total figures from model. No change in epidemic, but changes assumption to seed infections being at the very start of the following day as opposed to the very end of the current day. * Change in MetaModel migration factor Allow it to be updated during a simulation (required since it will decrease with social distancing measures) * MetaModel - handle case of empty entry in vaccine schedule * round_random when vaccinating a proportion of the population gives the correct mean over time for small numbers * Add seeding schedule to Model in R * Add set_seeding_schedule to MetaModel * Add seed_infect_by_indices * Add long term migration matrix for England and option to blend * Add long term migration matrix and ability to blend Add regional infectious rate factors to England model * In meta model move combine_run to be a private function * Add using generation kernel for migration in meta model Set default model for England metaModel * Covnert param_list to list of lists (different R versions have different defaults if not specified) * Add quarantine status to inidividual inforamtion which can be accessed via R/Python interfaces
1 parent 36f881b commit ffcc647

16 files changed

+22494
-339
lines changed
 

‎NAMESPACE

+12
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ importFrom( "plotly", "animation_opts" )
1717
importFrom( "plotly", "colorbar" )
1818
importFrom( "plotly", "%>%" )
1919
importFrom( "stringr", "str_replace_all")
20+
importFrom( "utils", "read.csv")
2021

2122
# R6 Classes
2223
export("Parameters")
@@ -35,6 +36,7 @@ export("MetaModel")
3536
export("Parameters.new")
3637
export("Parameters.get_param")
3738
export("Parameters.set_param")
39+
export("Parameters.default_param")
3840
export("Model.new")
3941
export("Model.one_time_step")
4042
export("Model.one_time_step_results")
@@ -59,5 +61,15 @@ export("VACCINE_STATUS")
5961
export("plot.value.total_infected")
6062
export("plot.value.new_infected")
6163
export("plot.values")
64+
export("plot.value.total_infected_strain_0")
65+
export("plot.value.new_infected_strain_0")
66+
export("plot.value.total_infected_strain_1")
67+
export("plot.value.new_infected_strain_1")
68+
export("plot.value.total_infected_strain_2")
69+
export("plot.value.new_infected_strain_2")
70+
export("plot.value.total_infected_strain_3")
71+
export("plot.value.new_infected_strain_3")
72+
export("plot.value.total_infected_strain_4")
73+
export("plot.value.new_infected_strain_4")
6274

6375
useDynLib(OpenABMCovid19, .registration = TRUE)

0 commit comments

Comments
 (0)
Please sign in to comment.