From ad4154dfd2301b8848396c1d6798ccdfee27e750 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Sun, 19 Dec 2021 11:32:26 -0600 Subject: [PATCH 1/4] set answer code 13 to NA before checking if col is all NA --- facebook/delphiFacebook/R/variables.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/facebook/delphiFacebook/R/variables.R b/facebook/delphiFacebook/R/variables.R index 5fefc7296..56f111e47 100644 --- a/facebook/delphiFacebook/R/variables.R +++ b/facebook/delphiFacebook/R/variables.R @@ -646,8 +646,8 @@ code_vaccines <- function(input_data, wave) { # If the entire column is NA, ifelse() results in a logical vector, not a # character vector, which confuses split_options; since the result should be # NA anyway + vaccine_barriers <- ifelse(vaccine_barriers == "13", NA_character_, vaccine_barriers) if (any(!is.na(vaccine_barriers))) { - vaccine_barriers <- ifelse(vaccine_barriers == "13", NA_character_, vaccine_barriers) vaccine_barriers <- split_options(vaccine_barriers) } @@ -786,8 +786,8 @@ code_vaccines <- function(input_data, wave) { # If the entire column is NA, ifelse() results in a logical vector, not a # character vector, which confuses split_options; since the result should be # NA anyway - if (any(!is.na(input_data$V15b))) { - vaccine_barriers <- ifelse(input_data$V15b == "13", NA, input_data$V15b) + vaccine_barriers <- ifelse(input_data$V15b == "13", NA, input_data$V15b) + if (any(!is.na(vaccine_barriers))) { vaccine_barriers <- split_options(vaccine_barriers) } else { vaccine_barriers <- input_data$V15b From 8576a28b39db3dcef0b6025a1a59f3f3f9f4bbe1 Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:02:43 -0600 Subject: [PATCH 2/4] cast vaccine_barriers to char --- facebook/delphiFacebook/R/variables.R | 8 ++++++-- facebook/delphiFacebook/src/RcppExports.cpp | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/facebook/delphiFacebook/R/variables.R b/facebook/delphiFacebook/R/variables.R index 56f111e47..2dfeec405 100644 --- a/facebook/delphiFacebook/R/variables.R +++ b/facebook/delphiFacebook/R/variables.R @@ -646,7 +646,9 @@ code_vaccines <- function(input_data, wave) { # If the entire column is NA, ifelse() results in a logical vector, not a # character vector, which confuses split_options; since the result should be # NA anyway - vaccine_barriers <- ifelse(vaccine_barriers == "13", NA_character_, vaccine_barriers) + vaccine_barriers <- as.character( + ifelse(vaccine_barriers == "13", NA_character_, vaccine_barriers) + ) if (any(!is.na(vaccine_barriers))) { vaccine_barriers <- split_options(vaccine_barriers) } @@ -786,7 +788,9 @@ code_vaccines <- function(input_data, wave) { # If the entire column is NA, ifelse() results in a logical vector, not a # character vector, which confuses split_options; since the result should be # NA anyway - vaccine_barriers <- ifelse(input_data$V15b == "13", NA, input_data$V15b) + vaccine_barriers <- as.character( + ifelse(input_data$V15b == "13", NA, input_data$V15b) + ) if (any(!is.na(vaccine_barriers))) { vaccine_barriers <- split_options(vaccine_barriers) } else { diff --git a/facebook/delphiFacebook/src/RcppExports.cpp b/facebook/delphiFacebook/src/RcppExports.cpp index e21e5728d..b0056334a 100644 --- a/facebook/delphiFacebook/src/RcppExports.cpp +++ b/facebook/delphiFacebook/src/RcppExports.cpp @@ -5,11 +5,6 @@ using namespace Rcpp; -#ifdef RCPP_USE_GLOBAL_ROSTREAM -Rcpp::Rostream& Rcpp::Rcout = Rcpp::Rcpp_cout_get(); -Rcpp::Rostream& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get(); -#endif - // is_selected_cpp LogicalVector is_selected_cpp(List responses, String target); RcppExport SEXP _delphiFacebook_is_selected_cpp(SEXP responsesSEXP, SEXP targetSEXP) { From 69b8971be7b48afcb0561d6eceb21d98fb1d18cb Mon Sep 17 00:00:00 2001 From: Nat DeFries <42820733+nmdefries@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:19:26 -0600 Subject: [PATCH 3/4] drop else since vaccine_barriers already named --- facebook/delphiFacebook/R/variables.R | 2 -- 1 file changed, 2 deletions(-) diff --git a/facebook/delphiFacebook/R/variables.R b/facebook/delphiFacebook/R/variables.R index 2dfeec405..0fb47e755 100644 --- a/facebook/delphiFacebook/R/variables.R +++ b/facebook/delphiFacebook/R/variables.R @@ -793,8 +793,6 @@ code_vaccines <- function(input_data, wave) { ) if (any(!is.na(vaccine_barriers))) { vaccine_barriers <- split_options(vaccine_barriers) - } else { - vaccine_barriers <- input_data$V15b } input_data$v_vaccine_barrier_eligible_tried <- is_selected(vaccine_barriers, "1") From a031bde181423ad42e85545b152c2ff5fc6cdc07 Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Sun, 19 Dec 2021 23:06:42 +0000 Subject: [PATCH 4/4] chore: bump covidcast-indicators to 0.2.18 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 795d08d17..aa0ea322f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.17 +current_version = 0.2.18 commit = True message = chore: bump covidcast-indicators to {new_version} tag = False