Merge pull request #58 from cmu-delphi/lists_of_realFix

fix: included NA's in lists_of_real_values

Author: dsweber2

R/targets_utils.R

@@ -23,7 +23,7 @@ make_target_param_grid <- function(param_grid) {
 lists_of_real_values <- function(param_grid) {
   full_lists <- transpose(param_grid %>% select(-forecaster, -id))
   filter_nonvalues <- function(x) {
-    Filter(Negate(function(a) is.null(a) && is.na(a)), x)
+    Filter(Negate(function(a) is.null(a) || is.na(a)), x)
   }
   map(full_lists, filter_nonvalues)
 }

tests/testthat/test-target-utils.R

@@ -0,0 +1,14 @@
+test_that("target param generation works", {
+  ex_frame <- tribble(
+    ~forecaster, ~id, ~someNAs, ~someNULLs,
+    "scaled_pop", "linreg", TRUE, 35,
+    "scaled_pop", "linreg", NA, 35,
+    "scaled_pop", "linreg", FALSE, NULL,
+  )
+  list_version <- list(
+    list(someNAs = TRUE, someNULLs = 35),
+    list(someNULLs = 35),
+    list(someNAs = FALSE)
+  )
+  expect_equal(lists_of_real_values(ex_frame), list_version)
+})