merge and kill bugs

Author: dajmcdon

R/extract.R

@@ -11,10 +11,10 @@
 #' @examples
 #' f <- frosting() %>%
 #'   layer_predict() %>%
-#'   layer_residual_quantile(probs = c(0.0275, 0.975), symmetrize = FALSE) %>%
+#'   layer_residual_quantiles(probs = c(0.0275, 0.975), symmetrize = FALSE) %>%
 #'   layer_naomit(.pred)
 #'
-#' extract_argument(f, "layer_residual_quantile", "symmetrize")
+#' extract_argument(f, "layer_residual_quantiles", "symmetrize")
 extract_argument <- function(x, name, arg, ...) {
   UseMethod("extract_argument")
 }

man/extract_argument.Rd

@@ -1,32 +1,32 @@
 test_that("layer argument extractor works", {
   f <- frosting() %>%
     layer_predict() %>%
-    layer_residual_quantile(probs = c(0.0275, 0.975), symmetrize = FALSE) %>%
+    layer_residual_quantiles(probs = c(0.0275, 0.975), symmetrize = FALSE) %>%
     layer_naomit(.pred)
 
   expect_error(extract_argument(f$layers[[1]], "uhoh", "bubble"))
   expect_error(extract_argument(f$layers[[1]], "layer_predict", "bubble"))
   expect_identical(
-    extract_argument(f$layers[[2]], "layer_residual_quantile", "probs"),
+    extract_argument(f$layers[[2]], "layer_residual_quantiles", "probs"),
     c(0.0275, 0.9750))
 
   expect_error(extract_argument(f, "layer_thresh", "probs"))
   expect_identical(
-    extract_argument(f, "layer_residual_quantile", "probs"),
+    extract_argument(f, "layer_residual_quantiles", "probs"),
     c(0.0275, 0.9750))
 
   wf <- epi_workflow(postprocessor = f)
-  expect_error(extract_argument(epi_workflow(), "layer_residual_quantile", "probs"))
+  expect_error(extract_argument(epi_workflow(), "layer_residual_quantiles", "probs"))
   expect_identical(
-    extract_argument(wf, "layer_residual_quantile", "probs"),
+    extract_argument(wf, "layer_residual_quantiles", "probs"),
     c(0.0275, 0.9750))
 
   expect_error(extract_argument(wf, "layer_predict", c("type", "opts")))
 })
 
 test_that("recipe argument extractor works", {
   jhu <- case_death_rate_subset %>%
-    filter(time_value > "2021-08-01") %>%
+    dplyr::filter(time_value > "2021-08-01") %>%
     dplyr::arrange(geo_value, time_value)
 
   r <- epi_recipe(jhu) %>%
@@ -40,21 +40,19 @@ test_that("recipe argument extractor works", {
 
   expect_error(extract_argument(r$steps[[1]], "uhoh", "bubble"))
   expect_error(extract_argument(r$steps[[1]], "step_epi_lag", "bubble"))
-  # CAREFUL!!
-  expect_error(extract_argument(r$steps[[2]], "step_epi_ahead", "ahead"))
-  expect_identical(extract_argument(r$steps[[2]], "step_epi_ahead", "shift"), -7)
+  expect_identical(extract_argument(r$steps[[2]], "step_epi_ahead", "ahead"), 7)
 
 
   expect_error(extract_argument(r, "step_lightly", "probs"))
   expect_identical(
-    extract_argument(r, "step_epi_lag", "shift"),
+    extract_argument(r, "step_epi_lag", "lag"),
     list(c(0,7,14), c(0,7,14))
   )
 
   wf <- epi_workflow(preprocessor = r)
-  expect_error(extract_argument(epi_workflow(), "step_epi_lag", "shift"))
+  expect_error(extract_argument(epi_workflow(), "step_epi_lag", "lag"))
   expect_identical(
-    extract_argument(wf, "step_epi_lag", "shift"),
+    extract_argument(wf, "step_epi_lag", "lag"),
     list(c(0,7,14), c(0,7,14))
   )
 })