Skip to content

Commit

Permalink
update examples to use new epiparameter function signature
Browse files Browse the repository at this point in the history
  • Loading branch information
joshwlambert committed Sep 25, 2024
1 parent 48260cb commit b183fff
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 70 deletions.
6 changes: 4 additions & 2 deletions R/checkers.R
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#' is_parameterised(ep)
#'
Expand Down
88 changes: 57 additions & 31 deletions R/epiparameter.R
Original file line number Diff line number Diff line change
Expand Up @@ -173,26 +173,34 @@ new_epiparameter <- function(disease = character(),
#' ebola_incubation <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#'
#' # minimal input required for discrete `epiparameter`
#' ebola_incubation <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1),
#' discretise = TRUE
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1),
#' discretise = TRUE
#' )
#' )
#'
#' # example with more fields filled in
#' ebola_incubation <- epiparameter(
#' disease = "ebola",
#' pathogen = "ebola_virus",
#' epi_dist = "incubation",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1),
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1),
#' discretise = FALSE,
#' truncation = NA
#' ),
#' uncertainty = create_uncertainty(),
#' summary_stats = create_summary_stats(mean = 2, sd = 1),
#' citation = create_citation(
Expand All @@ -211,8 +219,6 @@ new_epiparameter <- function(disease = character(),
#' method_assess = create_method_assess(
#' censored = TRUE
#' ),
#' discretise = FALSE,
#' truncation = NA,
#' notes = "No notes"
#' )
epiparameter <- function(disease,
Expand Down Expand Up @@ -381,8 +387,10 @@ test_epiparameter <- function(x) { # nolint cyclocomp_linter
#' epiparameter <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#' epiparameter
print.epiparameter <- function(x, ...) {
Expand All @@ -401,8 +409,10 @@ print.epiparameter <- function(x, ...) {
#' epiparameter <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#' format(epiparameter)
format.epiparameter <- function(x, ...) {
Expand Down Expand Up @@ -463,8 +473,10 @@ format.epiparameter <- function(x, ...) {
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "serial_interval",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#'
#' is_epiparameter(ep)
Expand Down Expand Up @@ -615,8 +627,10 @@ generate.epiparameter <- function(x, times, ...) {
#' ebola_incubation <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#' discretise(ebola_incubation)
discretise <- function(x, ...) {
Expand Down Expand Up @@ -710,18 +724,22 @@ discretise.default <- function(x, ...) {
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 1, scale = 1)
#' )
#' )
#' family(ep)
#'
#' # example with discretised distribution
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1),
#' discretise = TRUE
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1),
#' discretise = TRUE
#' )
#' )
#' family(ep)
family.epiparameter <- function(object, ...) {
Expand Down Expand Up @@ -775,17 +793,21 @@ family.epiparameter <- function(object, ...) {
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1)
#' )
#' )
#' is_truncated(ep)
#'
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1),
#' truncation = 10
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1),
#' truncation = 10
#' )
#' )
#' is_truncated(ep)
is_truncated <- function(x) {
Expand Down Expand Up @@ -830,17 +852,21 @@ is_truncated <- function(x) {
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "lnorm",
#' prob_distribution_params = c(meanlog = 1, sdlog = 1)
#' )
#' )
#' is_continuous(ep)
#' is_continuous(discretise(ep))
#'
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "offspring distribution",
#' prob_distribution = "nbinom",
#' prob_distribution_params = c(mean = 2, dispersion = 0.5)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "nbinom",
#' prob_distribution_params = c(mean = 2, dispersion = 0.5)
#' )
#' )
#' is_continuous(ep)
is_continuous <- function(x) {
Expand Down
6 changes: 4 additions & 2 deletions R/plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
#' ep <- epiparameter(
#' disease = "ebola",
#' epi_dist = "incubation_period",
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 2, scale = 1)
#' prob_distribution = create_prob_distribution(
#' prob_distribution = "gamma",
#' prob_distribution_params = c(shape = 2, scale = 1)
#' )
#' )
#' plot(ep)
#'
Expand Down
6 changes: 4 additions & 2 deletions man/discretise.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions man/epiparameter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions man/family.epiparameter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/format.epiparameter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions man/is_continuous.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/is_epiparameter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions man/is_parameterised.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions man/is_truncated.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b183fff

Please sign in to comment.