remove deprecated purrr::map_dfr calls and replace with `purrr::map…

…` -> `purrr::list_rbind`
harvard-ufds · Nov 19, 2024 · d477350 · d477350
1 parent 3c4111f
commit d477350
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -15,8 +15,8 @@ importFrom(furrr,future_map)
 importFrom(furrr,future_map2)
 importFrom(progressr,progressor)
 importFrom(progressr,with_progress)
+importFrom(purrr,list_rbind)
 importFrom(purrr,map)
 importFrom(purrr,map2)
-importFrom(purrr,map_dfr)
 importFrom(rlang,sym)
 useDynLib(saeczi, .registration = TRUE)
diff --git a/R/saeczi.R b/R/saeczi.R
@@ -41,7 +41,7 @@
 #' @importFrom dplyr summarise group_by mutate left_join
 #' @importFrom progressr progressor with_progress
 #' @importFrom furrr future_map furrr_options future_map2
-#' @importFrom purrr map map2 map_dfr
+#' @importFrom purrr map map2 list_rbind
 
 saeczi <- function(samp_dat,
                    pop_dat,
@@ -143,19 +143,23 @@ saeczi <- function(samp_dat,
             ))
 
       beta_lm_mat <- res |>
-        map_dfr(.f = ~ .x$beta_lm) |>
+        map(.f = ~ as.data.frame(t(.x$beta_lm))) |>
+        list_rbind() |> 
         as.matrix()
 
       beta_glm_mat <- res |>
-        map_dfr(.f = ~ .x$beta_glm) |>
+        map(.f = ~ as.data.frame(t(.x$beta_glm))) |>
+        list_rbind() |> 
         as.matrix()
 
       u_lm <- res |>
-        map_dfr(.f = ~ .x$u_lm) |>
+        map(.f = ~ as.data.frame(t(.x$u_lm))) |>
+        list_rbind() |> 
         as.matrix()
 
       u_glm <- res |>
-        map_dfr(.f = ~ .x$u_glm) |>
+        map(.f = ~ as.data.frame(t(.x$u_glm))) |>
+        list_rbind() |> 
         as.matrix()
 
       u_lm[is.na(u_lm)] <- 0

diff --git a/R/utils.R b/R/utils.R
@@ -275,19 +275,23 @@ boot_rep_par <- function(x,
                       .options = furrr_options(seed = TRUE))
 
   beta_lm_mat <- res |>
-    map_dfr(.f = ~ .x$beta_lm) |>
+    map(.f = ~ as.data.frame(t(.x$beta_lm))) |>
+    list_rbind() |> 
     as.matrix()
 
   beta_glm_mat <- res |>
-    map_dfr(.f = ~ .x$beta_glm) |>
+    map(.f = ~ as.data.frame(t(.x$beta_glm))) |>
+    list_rbind() |>
     as.matrix()
 
   u_lm <- res |> 
-    map_dfr(.f = ~ .x$u_lm) |> 
+    map(.f = ~ as.data.frame(t(.x$u_lm))) |> 
+    list_rbind() |> 
     as.matrix()
 
   u_glm <- res |> 
-    map_dfr(.f = ~ .x$u_glm) |> 
+    map(.f = ~ as.data.frame(t(.x$u_glm))) |> 
+    list_rbind() |> 
     as.matrix()