Merge branch 'master' into feature/marginalise

greta-dev · Feb 18, 2020 · f0c68a2 · f0c68a2 · lintr-bot · Feb 18, 2020
2 parents faa9cad + 18c581c
commit f0c68a2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -1159,8 +1159,13 @@ all_greta_arrays <- function(env = parent.frame(),
 
   # all objects in that environment as a named list
   all_object_names <- ls(envir = env)
-  all_objects <- lapply(all_object_names, get, envir = env)
-  names(all_objects) <- all_object_names
+
+  # loop carefully in case there are unfulfilled promises
+  all_objects <- list()
+  for (name in all_object_names) {
+    all_objects[[name]] <- tryCatch(get(name, envir = env),
+                                    error = function(e) NULL)
+  }
 
   # find the greta arrays
   is_greta_array <- vapply(all_objects,

diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -6,13 +6,15 @@ CRAN's
 dag
 DAGs
 devtools
+diag
 DiagrammeR
 dlkjcorr
 doi
 dontrun
 etc
 extraDistr
 Gelman
+gelman
 Geweke
 gfortran
 github

diff --git a/tests/testthat/test_iid_samples.R b/tests/testthat/test_iid_samples.R
@@ -23,7 +23,8 @@ test_that("univariate samples are correct", {
 
   compare_iid_samples(binomial,
                       rbinom,
-                      parameters = list(size = 12, prob = 0.3))
+                      parameters = list(size = 5, prob = 0.3),
+                      nsim = 1000)
 
   compare_iid_samples(beta_binomial,
                       extraDistr::rbbinom,