From f7606d1f32f8159b001ca1a241c8e98a13ba7620 Mon Sep 17 00:00:00 2001 From: Hannah Frick Date: Wed, 4 Feb 2026 12:15:25 +0000 Subject: [PATCH] move away from superseded `map_dfc()` --- NAMESPACE | 2 -- R/dials-package.R | 2 +- R/grids.R | 3 ++- R/space_filling.R | 14 ++++++-------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 138ecf21..b794e52a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -236,10 +236,8 @@ importFrom(lifecycle,deprecated) importFrom(pillar,type_sum) importFrom(purrr,map) importFrom(purrr,map2) -importFrom(purrr,map2_dfc) importFrom(purrr,map_chr) importFrom(purrr,map_dbl) -importFrom(purrr,map_dfc) importFrom(purrr,map_int) importFrom(purrr,map_lgl) importFrom(scales,is.trans) diff --git a/R/dials-package.R b/R/dials-package.R index 69eab8af..ea8f61ba 100644 --- a/R/dials-package.R +++ b/R/dials-package.R @@ -38,7 +38,7 @@ #' @importFrom glue glue glue_collapse #' @importFrom lifecycle deprecated #' @importFrom pillar type_sum -#' @importFrom purrr map_lgl map2_dfc map_chr map map2 map_dfc map_dbl map_int +#' @importFrom purrr map map_chr map_dbl map_int map_lgl map2 #' @importFrom scales transform_log2 is.trans transform_log10 #' @importFrom stats runif #' @importFrom tibble as_tibble is_tibble tibble new_tibble diff --git a/R/grids.R b/R/grids.R index 30023947..5b6f28c3 100644 --- a/R/grids.R +++ b/R/grids.R @@ -275,9 +275,10 @@ make_random_grid <- function( params <- map(param_quos, eval_tidy) # for now assume equal levels - parameters <- map_dfc(params, value_sample, n = size, original = original) param_names <- names(param_quos) + parameters <- map(params, value_sample, n = size, original = original) names(parameters) <- param_names + parameters <- as_tibble(parameters) if (!(quo_is_null(filter_quo))) { parameters <- dplyr::filter(parameters, !!filter_quo) } diff --git a/R/space_filling.R b/R/space_filling.R index c7341d7c..97f372bc 100644 --- a/R/space_filling.R +++ b/R/space_filling.R @@ -434,16 +434,15 @@ make_max_entropy_grid <- function( sf_grid <- as_tibble(sfd$design) # Get back to parameter units - sf_grid <- map2_dfc( + sf_grid <- map2( params, sf_grid, encode_unit, direction = "backward", original = original ) - colnames(sf_grid) <- param_names - - sf_grid + names(sf_grid) <- param_names + as_tibble(sf_grid) } #' @export @@ -526,14 +525,13 @@ make_latin_hypercube_grid <- function( sf_grid <- as_tibble(sfd$design) # Get back to parameter units - sf_grid <- map2_dfc( + sf_grid <- map2( params, sf_grid, encode_unit, direction = "backward", original = original ) - colnames(sf_grid) <- param_names - - sf_grid + names(sf_grid) <- param_names + as_tibble(sf_grid) }