Merge pull request #71 from RSGInc/54-remove-factorize_df-from-prep-d…

…ata-and-summary-functions

54 remove factorize df from prep data and summary functions

R/hts_prep_byvar.R

@@ -56,11 +56,9 @@ hts_prep_byvar = function(summarize_by = NULL,
           shared_name = summarize_by[[b]],
           wide_dt = byvar_dt_v,
           shared_name_vars = NULL,
-          variables_dt = variable_list,
-          remove_missing = TRUE,
-          missing_values = c("Missing Response", "995"),
-          checkbox_label_sep = ":",
-          to_single_row = TRUE
+          variables_dt = variables_dt,
+          to_single_row = TRUE,
+          ...
         )
 
     }

R/hts_prep_data.R

@@ -13,7 +13,7 @@
 #' @param threshold Threshold to define outliers. Default is 0.975.
 #' @param remove_missing Whether to remove missing values from the summary.
 #'  Default is TRUE.
-#' @param missing_value Missing value to remove. Default is 995.
+#' @param missing_values Missing values to remove. Default is 995.
 #' @param not_imputable Value representing 'Not imputable' to remove. Default
 #'  is -1.
 #' @param strataname  Name of strata name to bring in. Default is NULL.
@@ -61,10 +61,11 @@ hts_prep_data = function(summarize_var = NULL,
                          remove_outliers = TRUE,
                          threshold = 0.975,
                          remove_missing = TRUE,
-                         missing_value = 995,
+                         missing_values = c("Missing Response", "995"),
                          not_imputable = -1,
                          strataname = NULL) {
   # tictoc::tic("Total Time")
+
   # Message:
   msg_pt1 = paste0("Creating a summary of ",
                    hts_find_var(summarize_var, variables_dt = variables_dt), " ", summarize_var)
@@ -99,14 +100,26 @@ hts_prep_data = function(summarize_var = NULL,
 
   # Is this a shared variable?
   var_is_shared = variables_dt[shared_name == summarize_var, is_checkbox][1] == 1
-
+    
   # If yes, expand summarize_var:
   if (var_is_shared) {
 
     summarize_var = variables_dt[shared_name == summarize_var, variable]
 
+    for(i in 1:length(summarize_var)){
+
+      if(var_dt[,class(get(summarize_var[i]))] != 'integer'){
+
+        message("Checkbox variables must have integer values")
+
+        stop()
+
+      }
+
+    }
+
   }
-
+  
   # Subset table to these column(s):
   subset_cols = c(hts_get_keycols(var_dt), summarize_var)
 
@@ -125,7 +138,7 @@ hts_prep_data = function(summarize_var = NULL,
       shared_name_vars = summarize_var,
       remove_missing = TRUE,
       checkbox_label_sep = ":",
-      missing_values = c("Missing Response", "995"),
+      missing_values = missing_values,
       to_single_row = FALSE
     )
 
@@ -185,6 +198,32 @@ hts_prep_data = function(summarize_var = NULL,
 
   if (length(summarize_by) > 0) {
 
+    for (i in 1:length(summarize_by)){
+
+      var = summarize_by[i]
+
+      byvar_location = hts_find_var(var, variables_dt = variables_dt)
+
+      # Select table where this variable lives:
+      byvar_table = data[[byvar_location]]
+
+      byvar_is_shared = variables_dt[shared_name == var, is_checkbox][1] == 1
+
+      if (byvar_is_shared) {
+
+        var = variables_dt[shared_name == var, variable][1]
+
+      }
+
+      if(byvar_is_shared & byvar_table[,class(get(var))] != 'integer'){
+
+        message("Checkbox variables must have integer values")
+
+        stop()
+
+      }
+
+    }
     byvar_dt = hts_prep_byvar(summarize_by,
                               variables_dt = variables_dt,
                               hts_data = data)
@@ -221,7 +260,7 @@ hts_prep_data = function(summarize_var = NULL,
                                        variables_dt = variables_dt,
                                        summarize_var = summarize_var,
                                        summarize_by = summarize_by,
-                                       missing_value = missing_value,
+                                       missing_values = missing_values,
                                        not_imputable = not_imputable)
   }
 

R/hts_remove_missing_data.R

@@ -8,7 +8,8 @@
 #'  removed.
 #' @param summarize_by Variable being summarized by that has it's missing data
 #'  removed. Default is NULL.
-#' @param missing_value Missing value that will be removed. Default is 995.
+#' @param missing_values Missing values that will be removed. Defaults are 995 and
+#'  'Missing Response'.
 #' @param not_imputable Value meaning not_imputable that will be removed. Default
 #'  is -1.
 #'
@@ -31,7 +32,7 @@ hts_remove_missing_data = function(hts_data,
                                    variables_dt,
                                    summarize_var,
                                    summarize_by = NULL,
-                                   missing_value = 995,
+                                   missing_values = c("Missing Response", "995"),
                                    not_imputable = -1){
 
   summarize_var_loc = hts_find_var(summarize_var)
@@ -40,7 +41,7 @@ hts_remove_missing_data = function(hts_data,
   summarize_var_name = variables_dt[shared_name == summarize_var, variable][1]
 
   summarize_var_tbl = hts_data[[summarize_var_loc]][
-    !get(summarize_var_name) %in% c(missing_value, not_imputable) |
+    !get(summarize_var_name) %in% c(missing_values, not_imputable) |
       is.na(get(summarize_var_name))]
 
   summarize_var_id = hts_get_keycols(summarize_var_tbl,
@@ -65,7 +66,7 @@ hts_remove_missing_data = function(hts_data,
       summarize_by_name = variables_dt[shared_name == summarize_by[i], variable][1]
 
       summarize_by_tbl = hts_data[[summarize_by_loc]][
-        !get(summarize_by_name) %in% c(missing_value, not_imputable) |
+        !get(summarize_by_name) %in% c(missing_values, not_imputable) |
           is.na(get(summarize_by_name))]
 
       summarize_by_id = hts_get_keycols(summarize_by_tbl,