Merged namespace

kenmawer · kenmawer · commit 00f3755d0a44 · 2022-06-06T11:59:45.000-07:00
Merge branch 'main' of https://github.com/kenmawer/epipredict into km-issue_22_v3 # Conflicts: # NAMESPACE
diff --git a/NAMESPACE b/NAMESPACE
@@ -26,7 +26,12 @@ export(smooth_arx_args_list)
 export(smooth_arx_forecaster)
 export(step_epi_ahead)
 export(step_epi_lag)
+<<<<<<< HEAD
 export(step_narm)
+=======
+export(step_epi_naomit)
+export(step_epi_shift)
+>>>>>>> 878eb71132d58400f79ffdd6eb14452f289cbf6a
 import(recipes)
 importFrom(magrittr,"%>%")
 importFrom(rlang,"!!")
diff --git a/R/step_epi_naomit.R b/R/step_epi_naomit.R
@@ -6,7 +6,7 @@
 #' however, only omits predictors at prediction time
 #' @export
 
-step_narm <- function(x) {
+step_epi_naomit <- function(x) {
   x %>%
     recipes::step_naomit(all_predictors()) %>%
     recipes::step_naomit(all_outcomes(), skip = TRUE)
diff --git a/man/step_epi_naomit.Rd b/man/step_epi_naomit.Rd
diff --git a/tests/testthat/test-step_epi_naomit.R b/tests/testthat/test-step_epi_naomit.R
@@ -16,7 +16,7 @@ r <- epi_recipe(x) %>%
   step_epi_ahead(death_rate, ahead = 7) %>%
   step_epi_lag(death_rate, lag = c(0,7,14))
 
-z1 <- step_narm(r)
+z1 <- step_epi_naomit(r)
 z2 <- r %>%
   step_naomit(all_predictors()) %>%
   step_naomit(all_outcomes(), skip = TRUE)
