beyond frustrated ...

NAMESPACE

@@ -1,3 +1,4 @@
 # Generated by roxygen2: do not edit by hand
 
+export(assemble_data)
 export(fit_models)

R/assemble_data.R

@@ -9,22 +9,27 @@
 #' @param path_2_case_data character file path to the case data
 #' @param case_type character type of case data
 #' @param case_variable character name of the case field in the case data
+#' @param match_variable character name of the field to match data on
 #'
 #' @return a data.frame ready to estimate distributed lag models
 #' @export
 #'
 assemble_data <- function(x, path_2_case_data = here::here("data-raw/wnv_by_county.csv"),
                           case_type = c("neuro", "all"),
-                          case_variable = "cases"){
-  if(is.null(x) | !is.data.frame(x) | !tibble::is_tibble(x)){
+                          match_variable = "fips",
+                          case_variable = "cases"
+){
+  if(is.null(x) | !(is.data.frame(x) | tibble::is_tibble(x))){
     stop("x must be a data frame or tibble.")
   }
   if(!file.exists(path_2_case_data)){
     stop("Please provide a valid path to the WNV case data.")
   } else {
     wnvcases <- readr::read_csv(path_2_case_data)
+    mv1 <- eval(quote(match_variable), wnvcases)
+    mv2 <- eval(quote(match_variable), x)
     # check that all targets exist in case data
-    missing_targets <- dplyr::anti_join(x, wnvcases, by = "fips")
+    missing_targets <- dplyr::anti_join(x, wnvcases, by = match_variable)
     if (nrow(missing_targets) > 0){
       stop("Some prediction targets have no matches in case data.")
     }

tests/testthat/test-fit_models.R

@@ -1,3 +1,4 @@
+data(sampledat)
 test_that("data checks work", {
   expect_error(fit_models(x = NULL), "x must be a data frame or tibble.")
   expect_error(fit_models(x = sampledat, path_2_case_data = "almostcertainlynotavalidfile"),