differences for PR #55

compare-interventions.md

@@ -64,7 +64,7 @@ The diagram below describes the flow of individuals through the different compar
 
 <img src="fig/compare-interventions-rendered-unnamed-chunk-1-1.png" style="display: block; margin: auto;" />
 
-See `?epidemics::epidemic_vacamole` for detail on how to run the model. 
+See `?epidemics::model_vacamole_cpp` for detail on how to run the model. 
 
 ## Comparing scenarios
 

md5sum.txt

@@ -4,10 +4,10 @@
 "config.yaml" "ba8182fefb4b3a156058872157fb2d7d" "site/built/config.yaml" "2023-10-31"
 "index.md" "d45b8843b661f7f6d628b6b57447b6c5" "site/built/index.md" "2023-10-31"
 "links.md" "8184cf4149eafbf03ce8da8ff0778c14" "site/built/links.md" "2023-10-31"
-"episodes/simulating-transmission.Rmd" "9c915400856003c134ca46edd1c52d87" "site/built/simulating-transmission.md" "2023-10-31"
-"episodes/model-choices.Rmd" "113c11e0dccc812744f685df84733fdf" "site/built/model-choices.md" "2023-10-31"
-"episodes/modelling-interventions.Rmd" "01eff78117bf3f53015154ca9b961651" "site/built/modelling-interventions.md" "2023-10-31"
-"episodes/compare-interventions.Rmd" "d594dc0466f735d14ccbcc7b2a9d56ef" "site/built/compare-interventions.md" "2023-10-31"
+"episodes/simulating-transmission.Rmd" "ffefab0380c8477686b43d957ab45f36" "site/built/simulating-transmission.md" "2023-11-07"
+"episodes/model-choices.Rmd" "2bce847d6462de90d1cb479698dba709" "site/built/model-choices.md" "2023-11-07"
+"episodes/modelling-interventions.Rmd" "942c73e444c4ec7080a1727491ff4f0c" "site/built/modelling-interventions.md" "2023-11-07"
+"episodes/compare-interventions.Rmd" "b22d68654bc38c33ac8e4916e1be4c5f" "site/built/compare-interventions.md" "2023-11-07"
 "instructors/instructor-notes.md" "ca3834a1b0f9e70c4702aa7a367a6bb5" "site/built/instructor-notes.md" "2023-10-31"
 "learners/reference.md" "451e0fd931938d38cf92a313192c1cdb" "site/built/reference.md" "2023-10-31"
 "learners/setup.md" "b3c6bfa13fd687f926bb1a3e772a2516" "site/built/setup.md" "2023-10-31"

model-choices.md

@@ -62,7 +62,7 @@ Finally, interventions such as vaccination may be of interest. A model may or ma
 ### Available  models
 
 The R package `epidemics` contains functions to run existing models.
-For details on the models that are available, see the package [vignettes](https://epiverse-trace.github.io/epidemics/articles). To learn how to run the models in R, read the documentation using `?epidemics::epidemic_ebola`. Remember to use the 'Check model equation' questions to help your understanding of an  existing model. 
+For details on the models that are available, see the package [vignettes](https://epiverse-trace.github.io/epidemics/articles). To learn how to run the models in R, read the documentation using `?epidemics::model_ebola_cpp`. Remember to use the 'Check model equation' questions to help your understanding of an  existing model. 
 
 ::::::::::::::::::::::::::::::::::::: checklist
 ### Check model equations
@@ -85,9 +85,9 @@ You have been asked to explore the variation in numbers of infected individuals
 
 Which of the following models would be an appropriate choice for this task:
 
-+  `epidemic_default`
++  `model_default_cpp()`
 
-+ `epidemic_ebola`
++ `model_ebola_cpp()`
 
 ::::::::::::::::: hint
 
@@ -118,7 +118,7 @@ Consider the following questions:
 + What is the outcome of interest? **Number of infections**
 + Will any interventions be modelled? **No**
 
-#### `epidemic_default`
+#### `model_default_cpp()`
 
 A deterministic SEIR model with age specific direct transmission. 
 
@@ -128,7 +128,7 @@ A deterministic SEIR model with age specific direct transmission.
 The model is capable of predicting an Ebola type outbreak, but as the model is deterministic, we are not able to explore stochastic variation in the early stages of the outbreak.
 
 
-#### `epidemic_ebola`
+#### `model_ebola_cpp()`
 
 A stochastic SEIHFR (Susceptible, Exposed, Infectious, Hospitalised, Funeral, Removed) model that was developed specifically for infection with Ebola.
 

modelling-interventions.md

@@ -54,7 +54,7 @@ In mathematical modelling, we must make assumptions about how NPIs will affect t
 
 We want to investigate the effect of school closures on reducing the number of individuals infectious with COVID-19 through time. We assume that a school closure will reduce the frequency of contacts within and between different age groups. 
 
-Using an SEIR model (`epidemic_default()` in the R package `{epidemics}`) we set $R_0 = 2.7$, preinfectious period $= 4$ and the infectious_period $= 5.5$ (parameters adapted from [Davies et al. (2020)](https://doi.org/10.1016/S2468-2667(20)30133-X)). We load a contact matrix with age bins 0-18, 18-65, 65 years and older using `{socialmixr}` and assume that one in every 1 million in each age group is infectious at the start of the epidemic.
+Using an SEIR model (`model_default_cpp()` in the R package `{epidemics}`) we set $R_0 = 2.7$, preinfectious period $= 4$ and the infectious_period $= 5.5$ (parameters adapted from [Davies et al. (2020)](https://doi.org/10.1016/S2468-2667(20)30133-X)). We load a contact matrix with age bins 0-18, 18-65, 65 years and older using `{socialmixr}` and assume that one in every 1 million in each age group is infectious at the start of the epidemic.
 
 We will assume that school closures will reduce the contacts between school aged children (aged 0-15) by 0.5, and will cause a small reduction (0.01) in the contacts between adults (aged 15 and over). 
 
@@ -114,7 +114,7 @@ To run the model with an intervention we set ` intervention = list(contacts = cl
 
 
 ```r
-output_school <- epidemic_default_cpp(
+output_school <- model_default_cpp(
   population = uk_population,
   infection = covid,
   intervention = list(contacts = close_schools),
@@ -150,7 +150,7 @@ To implement this intervention on the parameter $\beta$, we specify `interventio
 
 
 ```r
-output_masks <- epidemic_default_cpp(
+output_masks <- model_default_cpp(
   population = uk_population,
   infection = covid,
   intervention = list(beta = mask_mandate),
@@ -200,7 +200,7 @@ We pass our vaccination object using `vaccination = vaccinate`:
 
 
 ```r
-output_vaccinate <- epidemic_default_cpp(
+output_vaccinate <- model_default_cpp(
   population = uk_population,
   infection = covid,
   vaccination = vaccinate,

simulating-transmission.md

@@ -64,7 +64,7 @@ pak::pak("epiverse-trace/epidemics")
 ## Model structures
 To generate predictions of infectious disease trajectories, we must first select a mathematical model to use.
 
-There is a library of models to choose from in `epidemics`. Models are prefixed with epidemic and suffixed by the infection name. In this tutorial, we will use the default epidemic model, `epidemic_default()` which is described in the next section.
+There is a library of models to choose from in `epidemics`. Models are prefixed with `model` and suffixed by the name of infection (e.g. ebola) or a different identifier (e.g. default), and whether the model has a R or C++ code base. In this tutorial, we will use the default epidemic model, `model_default_cpp()` which is described in the next section.
 
 
 ::::::::::::::::::::::::::::::::::::: callout
@@ -313,7 +313,7 @@ No we are ready to run our model. We will specify `time_end=600` to run the mode
 
 
 ```r
-output <- epidemic_default_cpp(
+output <- model_default_cpp(
   population = uk_population,
   infection = influenza,
   time_end = 600
@@ -402,7 +402,7 @@ output_samples <- Map(
     )
 
     # run an epidemic model using `epidemic()`
-    output <- epidemic_default_cpp(
+    output <- model_default_cpp(
       population = uk_population,
       infection = influenza,
       time_end = 600, increment = 1.0