reduce cyclocomp of delay distribution input checking

epiverse-trace · Jan 4, 2024 · e8bbbfa · e8bbbfa
1 parent 1c3dcb9
commit e8bbbfa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/R/sim_contacts.R b/R/sim_contacts.R
@@ -51,9 +51,8 @@ sim_contacts <- function(R,
   # check and convert distribution to func if needed before .check_sim_input()
   stopifnot(
     "Input delay distributions need to be either functions or <epidist>" =
-      (is.function(serial_interval) || inherits(serial_interval, "epidist")) &&
-      (is.function(contact_distribution) ||
-         inherits(contact_distribution, "epidist"))
+      inherits(serial_interval, c("function", "epidist")) &&
+      inherits(contact_distribution, c("function", "epidist"))
   )
   serial_interval <- as.function(serial_interval, func_type = "generate")
   contact_distribution <- as.function(

diff --git a/R/sim_linelist.R b/R/sim_linelist.R
@@ -137,9 +137,9 @@ sim_linelist <- function(R,
   # check and convert distribution to func if needed before .check_sim_input()
   stopifnot(
     "Input delay distributions need to be either functions or <epidist>" =
-      (is.function(serial_interval) || inherits(serial_interval, "epidist")) &&
-      (is.function(onset_to_hosp) || inherits(onset_to_hosp, "epidist")) &&
-      (is.function(onset_to_death) || inherits(onset_to_death, "epidist"))
+      inherits(serial_interval, c("function", "epidist")) &&
+      inherits(onset_to_hosp, c("function", "epidist")) &&
+      inherits(onset_to_death, c("function", "epidist"))
   )
   serial_interval <- as.function(serial_interval, func_type = "generate")
   onset_to_hosp <- as.function(onset_to_hosp, func_type = "generate")

diff --git a/R/sim_outbreak.R b/R/sim_outbreak.R
@@ -80,11 +80,10 @@ sim_outbreak <- function(R,
   # check and convert distribution to func if needed before .check_sim_input()
   stopifnot(
     "Input delay distributions need to be either functions or <epidist>" =
-      (is.function(serial_interval) || inherits(serial_interval, "epidist")) &&
-      (is.function(onset_to_hosp) || inherits(onset_to_hosp, "epidist")) &&
-      (is.function(onset_to_death) || inherits(onset_to_death, "epidist")) &&
-      (is.function(contact_distribution) ||
-         inherits(contact_distribution, "epidist"))
+      inherits(serial_interval, c("function", "epidist")) &&
+      inherits(onset_to_hosp, c("function", "epidist")) &&
+      inherits(onset_to_death, c("function", "epidist")) &&
+      inherits(contact_distribution, c("function", "epidist"))
   )
   serial_interval <- as.function(serial_interval, func_type = "generate")
   onset_to_hosp <- as.function(onset_to_hosp, func_type = "generate")