update simulate for integer

emitanaka · Sep 27, 2023 · 7fec1c3 · 7fec1c3
1 parent 71e6a2e
commit 7fec1c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/R/design.R b/R/design.R
@@ -23,6 +23,7 @@ design <- function(title = NULL, name = "edibble", .record = TRUE, seed = NULL,
   provenance$set_name(name)
   provenance$save_seed(seed, type = "design")
   structure(list(graph = provenance$get_graph(),
+                 validation = list(rcrds = NULL),
                  provenance = provenance,
                  anatomy = NULL,
                  recipe = NULL,

diff --git a/R/simulate.R b/R/simulate.R
@@ -178,7 +178,6 @@ get_rcrd_values <- function(rname, prov, aggfn, .data, y, censor) {
 get_censored_value <- function(y, valid, censor) {
   if(is_null(valid)) return(y)
   type <- valid$record
-  # add type == "whole" for integer.
   if(type=="numeric") {
     value <- valid$value
     valid_env <- rlang::current_env()
@@ -213,6 +212,12 @@ get_censored_value <- function(y, valid, censor) {
       y[!ind] <- censor
     }
     y
+  } else if(type=="integer") {
+    valid$record <- "numeric"
+    res <- get_censored_value(y, valid, censor)
+    round(res)
+  } else {
+    y
   }
 }
 
@@ -372,7 +377,7 @@ autofill_rcrds <- function(.data, ..., .seed = NULL) {
     if(is.na(deps[[rname]]$type)) {
       code_list <- effects_code(dep_fcts, .data, code_list)
       code_adjust_y <- ""
-    } else if(deps[[rname]]$type=="numeric") {
+    } else if(deps[[rname]]$type %in% c("numeric", "integer")) {
       if(vrcrds[[rname]]$operator == "equal" | (vrcrds[[rname]]$operator == "between" && vrcrds[[rname]]$value[1] == vrcrds[[rname]]$value[2])) {
         code_list <- list(process_code = "",
                           model_code = "")