From bc1d1265fb85a782a072e179827ce3efae5ccd44 Mon Sep 17 00:00:00 2001 From: Ryan Peterson Date: Sat, 29 Nov 2025 15:01:13 -0600 Subject: [PATCH] Update progress bar --- DESCRIPTION | 7 ++++--- NAMESPACE | 1 + NEWS.md | 1 + R/bestNormalize.R | 13 +++++++++++-- man/bestNormalize-package.Rd | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f16b863..fd8fcbd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,8 @@ Package: bestNormalize Type: Package Title: Normalizing Transformation Functions Version: 1.9.1.9000 -Date: 2023-09-20 -Authors@R: person("Ryan Andrew", "Peterson", +Date: 2025-11-29 +Authors@R: person("Ryan A", "Peterson", email = "ryan.a.peterson@cuanschutz.edu", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-4650-5798")) @@ -40,6 +40,7 @@ Imports: methods, butcher, purrr, + progress, generics Suggests: knitr, @@ -54,5 +55,5 @@ Suggests: covr VignetteBuilder: knitr LazyData: true -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.3 Encoding: UTF-8 diff --git a/NAMESPACE b/NAMESPACE index 71931e3..ed9bd3d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -77,6 +77,7 @@ importFrom(graphics,lines) importFrom(graphics,plot) importFrom(graphics,points) importFrom(methods,is) +importFrom(progress,progress_bar) importFrom(purrr,map) importFrom(recipes,add_step) importFrom(recipes,bake) diff --git a/NEWS.md b/NEWS.md index f1ee04a..1376b97 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ - adding `lambert` of type "hh" as option when `allow_lambert_h` is set to `TRUE`, per request from [issue 24](https://github.com/petersonR/bestNormalize/issues/24) +- fixing deprecation of `dplyr::progress_estimated` (#26) # bestNormalize 1.9.1 diff --git a/R/bestNormalize.R b/R/bestNormalize.R index 6553896..4cd1067 100644 --- a/R/bestNormalize.R +++ b/R/bestNormalize.R @@ -133,6 +133,9 @@ #' #' @seealso \code{\link[bestNormalize]{boxcox}}, \code{\link{orderNorm}}, #' \code{\link{yeojohnson}} +#' +#' @importFrom progress progress_bar +#' #' @export bestNormalize <- function(x, standardize = TRUE, @@ -391,7 +394,13 @@ get_oos_estimates <- function(x, standardize, norm_methods, k, r, # Perform in this session if cluster unspecified if(is.null(cluster)) { - if(!quiet & length(x) > 2000) pb <- dplyr::progress_estimated(r*k) + if(!quiet & length(x) > 2000) { + pb <- progress::progress_bar$new( + format = " computing [:bar] :percent eta: :eta", + total = k * r, + width = 60 + ) + } reps <- lapply(1:r, function(rep) { resamples <- create_folds(x, k) @@ -409,7 +418,7 @@ get_oos_estimates <- function(x, standardize, norm_methods, k, r, pstats[i, m] <- suppressWarnings(do.call(norm_stat_fn, list(x = vec))) } } - if(!quiet & length(x) > 2000) pb$tick()$print() + if(!quiet & length(x) > 2000) pb$tick() } colnames(pstats) <- norm_methods rownames(pstats) <- paste0("Rep", rep, "Fold", 1:k) diff --git a/man/bestNormalize-package.Rd b/man/bestNormalize-package.Rd index ae1723d..d48cd96 100644 --- a/man/bestNormalize-package.Rd +++ b/man/bestNormalize-package.Rd @@ -21,6 +21,6 @@ Useful links: } \author{ -\strong{Maintainer}: Ryan Andrew Peterson \email{ryan.a.peterson@cuanschutz.edu} (\href{https://orcid.org/0000-0002-4650-5798}{ORCID}) +\strong{Maintainer}: Ryan A Peterson \email{ryan.a.peterson@cuanschutz.edu} (\href{https://orcid.org/0000-0002-4650-5798}{ORCID}) }