Modifying .evalWith and adding broom.helper

kgoldfeld · Jul 24, 2024 · f2cf8c8 · f2cf8c8
1 parent 89ce276
commit f2cf8c8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -57,6 +57,7 @@ Suggests:
     survival,
     testthat,
     gtsummary,
+    broom.helpers,
     survminer,
     katex,
     dirmult,

diff --git a/R/generate_dist.R b/R/generate_dist.R
@@ -298,10 +298,10 @@
       " two probabilities."
     ))
   }
-
+  
   parsedProbs <-
     .evalWith(formulas, .parseDotVars(formulas, envir), dtSim, n, envir)
-
+  
   if (link == "logit") {
     parsedProbs <- exp(parsedProbs)
     parsedProbs <- parsedProbs / (1 + rowSums(parsedProbs))

diff --git a/R/internal_utility.R b/R/internal_utility.R
@@ -112,7 +112,25 @@
     }
   }
 
-  list2env(as.list(envir), envir = environment()) # added 20240718
+  ### Get functions from calling environment - added 20240724
+
+  if (length(ls(envir)) != 0) {.  
+
+    all_objects <- ls(envir)
+
+    function_objects <- all_objects[
+      sapply(
+        all_objects,
+        function(obj) {
+          is.function(get(obj, envir = envir))
+        })
+    ]
+
+    functions_list <- mget(function_objects, envir = envir)
+    list2env(functions_list, envir = environment())
+  }
+
+  ####
 
   parsedValues <- sapply(formula, evalFormula)