Updated changes and broken syntax.

Author: kenmawer

NAMESPACE

@@ -1,13 +1,16 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(bake,step_epi_ahead)
 S3method(bake,step_epi_lag)
 S3method(epi_keys,default)
 S3method(epi_keys,epi_df)
 S3method(epi_keys,recipe)
 S3method(epi_recipe,default)
 S3method(epi_recipe,epi_df)
 S3method(epi_recipe,formula)
+S3method(prep,step_epi_ahead)
 S3method(prep,step_epi_lag)
+S3method(print,step_epi_ahead)
 S3method(print,step_epi_lag)
 export("%>%")
 export(arx_args_list)
@@ -24,6 +27,7 @@ export(knnarx_args_list)
 export(knnarx_forecaster)
 export(smooth_arx_args_list)
 export(smooth_arx_forecaster)
+export(step_epi_ahead)
 export(step_epi_lag)
 import(recipes)
 importFrom(magrittr,"%>%")

R/epi_lag.R

@@ -85,15 +85,7 @@ bake.step_epi_lag <- function(object, new_data, ...) {
   if (!all(object$lag == as.integer(object$lag))) {
     rlang::abort("step_epi_lag requires 'lag' argument to be integer valued.")
   }
-
-<<<<<<< HEAD:R/epi_lag.R
-  is_neg <- object$lag < 0
-
-  grid <- tidyr::expand_grid(col = object$columns,
-                             lag_val = abs(object$lag)) %>%
-=======
   grid <- tidyr::expand_grid(col = object$columns, lag_val = object$lag) %>%
->>>>>>> 492234ba8c73adb74c7798d84ab908539b210ed5:R/step_epi_lag.R
     dplyr::mutate(newname = glue::glue("{object$prefix}{lag_val}_{col}"))
 
   ## ensure no name clashes