Merge ded8b04 into 9de9857

R/misc.R

@@ -14,6 +14,31 @@ named_list <- function(names, values = NULL) {
   setNames(values, names)
 }
 
+
+# flatten a list that may contain vectors into a single level list
+unnest <- function(x) {
+
+  out <- list()
+
+  names_x <- names(x)
+  for (i in seq_along(x)) {
+    if (length(x[[i]]) > 1) {
+      if (rlang::is_named(x[[i]])) {
+        names_i <- names(x[[i]])
+      } else {
+        names_i <- paste0(names_x[[i]], ".", c(1:length(x[[i]])))
+      }
+      for (j in seq_along(x[[i]])) {
+        out[[names_i[j]]] <- x[[i]][[j]]
+      }
+    } else {
+      out[[names_x[[i]]]] <- x[[i]]
+    }
+  }
+  out
+}
+
+
 # unlist lapply output
 ulapply <- function(X, FUN, ..., recursive = TRUE, use.names = TRUE) {
   unlist(lapply(X, FUN, ...), recursive, use.names)

R/summarise_draws.R

@@ -341,30 +341,21 @@ summarise_draws_helper <- function(x, funs, .args) {
   variables_x <- variables(x)
   # get length and output names, calculated on the first variable
   out_1 <- create_summary_list(x, variables_x[1], funs, .args)
-  the_names <- vector(mode = "list", length = length(funs))
-  for (i in seq_along(out_1)){
-    if (rlang::is_named(out_1[[i]])) {
-      the_names[[i]] <- names(out_1[[i]])
-    } else if (length(out_1[[i]]) > 1) {
-      the_names[[i]] <- paste0(names(out_1)[i], ".", c(1:length(out_1[[i]])))
-    } else {
-      the_names[[i]] <- names(out_1)[i]
-    }
-  }
-  the_names <- unlist(the_names)
+  out_1 <- unnest(out_1)
+  the_names <- names(out_1)
   # Check for naming issues prior do doing lengthy computation
   if ("variable" %in% the_names) {
     stop_no_call("Name 'variable' is reserved in 'summarise_draws'.")
   }
   # Pre-allocate matrix to store output
-  out <- matrix(NA, nrow = length(variables_x), ncol = length(the_names))
+  out <- data.frame(matrix(NA, nrow = length(variables_x), ncol = length(the_names)))
   colnames(out) <- the_names
-  out[1, ] <- unlist(out_1)
+  out[1, ] <- out_1
   # Do the computation for all remaining variables
   if (length(variables_x) > 1L) {
     for (v_ind in 2:length(variables_x)) {
       out_v <- create_summary_list(x, variables_x[v_ind], funs, .args)
-      out[v_ind, ] <- unlist(out_v)
+      out[v_ind, ] <- unnest(out_v)
     }
   }
   out <- tibble::as_tibble(out)

tests/testthat/test-summarise_draws.R

@@ -19,6 +19,14 @@ test_that("summarise_draws works correctly", {
   sum_x <- summarise_draws(x)
   expect_true(is.na(sum_x[1, "q5"]))
   expect_true(all(c("q5", "q95") %in% names(sum_x)))
+
+  sum_x <- summarise_draws(x, quantile2 = ~quantile2(.x, names = FALSE))
+  expect_true(all(c("quantile2.1", "quantile2.2") %in% names(sum_x)))
+
+  sum_x <- summarise_draws(x, mean, char = function(x) "char")
+  expect_double(sum_x[["mean"]])
+  expect_character(sum_x[["char"]])
+
 })
 
 test_that("aliases of summarise_draws work", {