allow assignment_variable_name and sampling_variable_name take unquot…

…ed strings
DeclareDesign · Jul 1, 2017 · 306310f · 306310f
1 parent d025131
commit 306310f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/R/declare_assignment.R b/R/declare_assignment.R
@@ -114,6 +114,13 @@ assignment_function_default <- function(data, ..., assignment_variable_name = "Z
     options$N <- as.lazy(nrow(data))
   }
 
+  assignment_variable_name <- substitute(assignment_variable_name)
+  if (!is.null(assignment_variable_name)) {
+    assignment_variable_name <- as.character(assignment_variable_name)
+  } else {
+    stop("Please provide a name for the assignment variable as assignment_variable_name.")
+  }
+
   mcall <- make_call(quote(randomizr::conduct_ra), args = options)
 
   data[,assignment_variable_name] <- lazy_eval(mcall, data = data)

diff --git a/R/declare_sampling.R b/R/declare_sampling.R
@@ -100,6 +100,13 @@ sampling_function_default <- function(data, ..., sampling_variable_name = "S"){
     options$N <- as.lazy(nrow(data))
   }
 
+  sampling_variable_name <- substitute(sampling_variable_name)
+  if (!is.null(sampling_variable_name)) {
+    sampling_variable_name <- as.character(sampling_variable_name)
+  } else {
+    stop("Please provide a name for the sampling variable as sampling_variable_name.")
+  }
+
   mcall <- make_call(quote(randomizr::draw_rs), args = options)
 
   data[,sampling_variable_name] <- lazy_eval(mcall, data = data)