only check doi if character

epiforecasts · Apr 17, 2024 · 6440e29 · 6440e29
1 parent fa0274f
commit 6440e29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/contact_matrix.r b/R/contact_matrix.r
@@ -60,7 +60,7 @@ contact_matrix <- function(survey, countries = NULL, survey.pop, age.limits, fil
   error_string <-
     "must be a survey object (created using `survey()` or `get_survey()`)"
 
-  if (all(is_doi(survey))) {
+  if (is_doi(survey)) {
     deprecate_warn(
       "0.3.2", paste0("contact_matrix(survey = '", error_string, "')"),
       details = "Passing a DOI will be removed in version 0.4.0."

diff --git a/R/download_survey.r b/R/download_survey.r
@@ -136,5 +136,5 @@ find_common_prefix <- function(vec) {
 ##' @return Logical; \code{TRUE} if \code{x} is a DOI, \code{FALSE} otherwise
 ##' @author Sebastian Funk
 is_doi <- function(x) {
-  is.character(x) & grepl("^10.[0-9.]{4,}/[-._;()/:A-z0-9]+$", x)
+  is.character(x) && grepl("^10.[0-9.]{4,}/[-._;()/:A-z0-9]+$", x)
 }