Merge pull request #436 from cmu-delphi/ndefries/opt-slide-cleanup

Idiomatic cleanup of `epi_slide_opt` computation function checks

Author: nmdefries

NAMESPACE

@@ -142,6 +142,7 @@ importFrom(rlang,caller_env)
 importFrom(rlang,enquo)
 importFrom(rlang,enquos)
 importFrom(rlang,env)
+importFrom(rlang,expr_label)
 importFrom(rlang,f_env)
 importFrom(rlang,f_rhs)
 importFrom(rlang,is_environment)

R/slide.R

@@ -376,8 +376,8 @@ epi_slide <- function(x, f, ..., before, after, ref_time_values,
 #' @template opt-slide-details
 #'
 #' @importFrom dplyr bind_rows mutate %>% arrange tibble select
-#' @importFrom rlang enquo quo_get_expr as_label
-#' @importFrom purrr map
+#' @importFrom rlang enquo quo_get_expr as_label expr_label caller_arg
+#' @importFrom  purrr map map_lgl
 #' @importFrom data.table frollmean frollsum frollapply
 #' @importFrom lubridate as.period
 #' @importFrom checkmate assert_function
@@ -459,25 +459,25 @@ epi_slide_opt <- function(x, col_names, f, ..., before, after, ref_time_values,
   # `data.table` and `slider` (or a function that has the exact same
   # definition, e.g. if the function has been reexported or defined
   # locally).
-  if (any(sapply(
-    c(frollmean, frollsum, frollapply),
+  if (any(map_lgl(
+    list(frollmean, frollsum, frollapply),
     function(roll_fn) {
-      isTRUE(identical(f, roll_fn))
+      identical(f, roll_fn)
     }
   ))) {
     f_from_package <- "data.table"
-  } else if (any(sapply(
-    c(slide_sum, slide_prod, slide_mean, slide_min, slide_max, slide_all, slide_any),
+  } else if (any(map_lgl(
+    list(slide_sum, slide_prod, slide_mean, slide_min, slide_max, slide_all, slide_any),
     function(roll_fn) {
-      isTRUE(identical(f, roll_fn))
+      identical(f, roll_fn)
     }
   ))) {
     f_from_package <- "slider"
   } else {
     # `f` is from somewhere else and not supported
     cli_abort(
       c(
-        "slide function `f` is not supported",
+        "problem with {rlang::expr_label(rlang::caller_arg(f))}",
         "i" = "`f` must be one of `data.table`'s rolling functions (`frollmean`,
               `frollsum`, `frollapply`. See `?data.table::roll`) or one of
               `slider`'s specialized sliding functions (`slide_mean`, `slide_sum`,