diff --git a/R/pev.R b/R/pev.R index a268ab36..fa58c5a7 100644 --- a/R/pev.R +++ b/R/pev.R @@ -32,7 +32,7 @@ create_epi_pev_process <- function( if (parameters$pev_epi_min_wait == 0) { target <- to_vaccinate$to_vector() } else { - not_recently_vaccinated <- variables$vaccinated_timestep$get_index_of( + not_recently_vaccinated <- variables$pev_timestep$get_index_of( a = max(timestep - parameters$pev_epi_min_wait, 0), b = timestep )$not(TRUE) diff --git a/R/pev_parameters.R b/R/pev_parameters.R index eb440de0..e54967fb 100644 --- a/R/pev_parameters.R +++ b/R/pev_parameters.R @@ -65,7 +65,8 @@ rtss_booster_profile <- create_pev_profile( #' @param profile primary vaccine profile of type PEVProfile #' @param coverages a vector of coverages for the primary doses #' @param timesteps a vector of timesteps associated with coverages -#' @param age for the target population, (in timesteps) +#' @param age the age when an individual will receive the first dose of the +#' vaccine (in timesteps) #' @param min_wait the minimum acceptable time since the last vaccination (in #' timesteps); When seasonal_boosters = TRUE, this represents the minimum time #' between an individual receiving the final dose and the first booster. When using diff --git a/man/get_parameters.Rd b/man/get_parameters.Rd index fb9d89df..7ada2861 100644 --- a/man/get_parameters.Rd +++ b/man/get_parameters.Rd @@ -183,7 +183,7 @@ clinically diseased (these values refer to the index in drug_* parameters); defa \item clinical_treatment_coverage - a vector of coverage values for each drug; default = NULL, NULL, NULL } -PEV paramters: +PEV parameters: please set vaccine strategies with the convenience functions in \code{pev_parameters.R:set_pev_epi} \code{pev_parameters.R:set_mass_pev} diff --git a/man/set_pev_epi.Rd b/man/set_pev_epi.Rd index 15826449..b728e923 100644 --- a/man/set_pev_epi.Rd +++ b/man/set_pev_epi.Rd @@ -26,7 +26,8 @@ set_pev_epi( \item{timesteps}{a vector of timesteps associated with coverages} -\item{age}{for the target population, (in timesteps)} +\item{age}{the age when an individual will receive the first dose of the +vaccine (in timesteps)} \item{min_wait}{the minimum acceptable time since the last vaccination (in timesteps); When seasonal_boosters = TRUE, this represents the minimum time diff --git a/tests/testthat/test-pev-epi.R b/tests/testthat/test-pev-epi.R index 684e98dd..4eea8445 100644 --- a/tests/testthat/test-pev-epi.R +++ b/tests/testthat/test-pev-epi.R @@ -86,7 +86,7 @@ test_that('pev epi targets correct age and respects min_wait', { variables$birth <- individual::IntegerVariable$new( -c(18, 18, 2.9, 18, 18) * 365 + timestep ) - variables$vaccinated_timestep <- mock_integer( + variables$pev_timestep <- mock_integer( c(50, -1, -1, 4*365, -1) )