Expose dt/steps_per_day control

R/carehomes.R

@@ -141,6 +141,8 @@ NULL
 ##'   rate is used for all age groups; if a vector of values if used it should
 ##'   have one value per age group.
 ##'
+##' @param steps_per_day Number of steps to use per day (integer, at least 1)
+##'
 ##' @param model_pcr_and_serology_user A value of 1 or 0 so switch on or off the
 ##'   flows out of T_PCR_neg and T_sero_neg and the corresponding cap on the
 ##'   number of individuals leaving the R compartments
@@ -276,9 +278,10 @@ carehomes_parameters <- function(start_date, region,
                                  vaccine_daily_doses = 0,
                                  waning_rate = 0,
                                  model_pcr_and_serology_user = 1,
+                                 steps_per_day = 4,
                                  exp_noise = 1e6) {
   ret <- sircovid_parameters_shared(start_date, region,
-                                    beta_date, beta_value)
+                                    beta_date, beta_value, steps_per_day)
 
   ## These are only used here, and are fixed
   carehome_occupancy <- 0.742

R/parameters.R

@@ -1,8 +1,14 @@
 ## These could be moved to be defaults within the models
 sircovid_parameters_shared <- function(start_date, region,
-                                       beta_date, beta_value) {
-  dt <- 0.25
+                                       beta_date, beta_value,
+                                       steps_per_day = 4) {
+  assert_scalar(steps_per_day)
+  assert_integer(steps_per_day)
+  if (steps_per_day < 1) {
+    stop("'steps_per_day' must be at least 1")
+  }
   assert_sircovid_date(start_date)
+  dt <- 1 / steps_per_day
   beta_step <- sircovid_parameters_beta(beta_date, beta_value %||% 0.08, dt)
   list(hosp_transmission = 0.1,
        ICU_transmission = 0.05,