Merge pull request #84 from cmu-delphi/72-refactor-epi_workflow-builder

Refactor epi_workflow() builder

Author: dajmcdon

R/epi_workflow.R

@@ -36,15 +36,13 @@
 #' wf <- epi_workflow(r, linear_reg())
 #'
 #' wf
-epi_workflow <- function(preprocessor = NULL, spec = NULL,
-                         postprocessor = NULL) {
+epi_workflow <- function(preprocessor = NULL, spec = NULL, postprocessor = NULL) {
   out <- workflows::workflow(spec = spec)
   class(out) <- c("epi_workflow", class(out))
 
   if (is_epi_recipe(preprocessor)) {
-    return(add_epi_recipe(out, preprocessor))
-  }
-  if (!is_null(preprocessor)) {
+    out <- add_epi_recipe(out, preprocessor)
+  }else if (!is_null(preprocessor)) {
     out <- workflows:::add_preprocessor(out, preprocessor)
   }
   if (!is_null(postprocessor)) {

tests/testthat/test-epi_workflow.R

@@ -0,0 +1,35 @@
+
+test_that("postprocesser was evaluated", {
+  r <- epi_recipe(case_death_rate_subset)
+  s <- parsnip::linear_reg()
+  f <- frosting()
+
+  ef <- epi_workflow(r, s, f)
+  ef2 <- epi_workflow(r, s) %>% add_frosting(f)
+
+  expect_true(epipredict:::has_postprocessor(ef))
+  expect_true(epipredict:::has_postprocessor(ef2))
+})
+
+
+test_that("outcome of the two methods are the same", {
+  jhu <- case_death_rate_subset
+
+  r <- epi_recipe(jhu) %>%
+    step_epi_lag(death_rate, lag = c(0, 7)) %>%
+    step_epi_ahead(death_rate, ahead = 7) %>%
+    step_epi_lag(case_rate, lag = c(7)) %>%
+    step_naomit(all_predictors()) %>%
+    step_naomit(all_outcomes())
+
+  s <- parsnip::linear_reg()
+  f <- frosting() %>%
+    layer_predict() %>%
+    layer_naomit(.pred) %>%
+    layer_residual_quantile()
+
+  ef <- epi_workflow(r, s, f)
+  ef2 <- epi_workflow(r, s) %>% add_frosting(f)
+
+  expect_equal(ef,ef2)
+})