tidymodels · hfrick · Feb 21, 2024 · Feb 21, 2024 · Feb 21, 2024 · Feb 21, 2024
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -15,7 +15,7 @@ URL: https://dials.tidymodels.org, https://github.com/tidymodels/dials
 BugReports: https://github.com/tidymodels/dials/issues
 Depends:
     R (>= 3.4),
-    scales
+    scales (>= 1.3.0)
 Imports:
     cli,
     DiceDesign,

diff --git a/NAMESPACE b/NAMESPACE
@@ -227,8 +227,8 @@ importFrom(purrr,map_dfc)
 importFrom(purrr,map_int)
 importFrom(purrr,map_lgl)
 importFrom(scales,is.trans)
-importFrom(scales,log10_trans)
-importFrom(scales,log2_trans)
+importFrom(scales,transform_log10)
+importFrom(scales,transform_log2)
 importFrom(stats,runif)
 importFrom(tibble,as_tibble)
 importFrom(tibble,is_tibble)

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
 # dials (development version)
 
-* Improving error messages by switching to cli (#315).
+* Improving error messages by switching to cli (#315, #317, #321).
+
+* Update usage of tranformation functions from the scales package to their new names and require the corresponding version v1.3.0 (#323).
 
 
 # dials 1.2.0

diff --git a/R/dials-package.R b/R/dials-package.R
@@ -39,7 +39,7 @@
 #' @importFrom lifecycle deprecated
 #' @importFrom pillar type_sum
 #' @importFrom purrr map_lgl map2_dfc map_chr map map2 map_dfc map_dbl map_int
-#' @importFrom scales log2_trans is.trans log10_trans
+#' @importFrom scales transform_log2 is.trans transform_log10
 #' @importFrom stats runif
 #' @importFrom tibble as_tibble is_tibble tibble new_tibble
 #' @importFrom utils installed.packages globalVariables

diff --git a/R/param_Laplace.R b/R/param_Laplace.R
@@ -7,7 +7,7 @@
 #' these values should be in the _transformed units_.
 #'
 #' @param trans A `trans` object from the `scales` package, such as
-#' `scales::log10_trans()` or `scales::reciprocal_trans()`. If not provided,
+#' `scales::transform_log10()` or `scales::transform_reciprocal()`. If not provided,
 #' the default is used which matches the units used in `range`. If no
 #' transformation, `NULL`.
 #'

diff --git a/R/param_engine_c50.R b/R/param_engine_c50.R
@@ -17,7 +17,7 @@
 #' rule_bands()
 #' @rdname c5_parameters
 #' @export
-confidence_factor <- function(range = c(-1, 0), trans = log10_trans()) {
+confidence_factor <- function(range = c(-1, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_engine_partykit.R b/R/param_engine_partykit.R
@@ -4,7 +4,7 @@
 #' largest possible values, respectively.
 #'
 #' @param trans A `trans` object from the `scales` package, such as
-#' `scales::log10_trans()` or `scales::reciprocal_trans()`. If not provided,
+#' `scales::transform_log10()` or `scales::transform_reciprocal()`. If not provided,
 #' the default is used which matches the units used in `range`. If no
 #' transformation, `NULL`.
 #' @param values A character string of possible values.
@@ -15,7 +15,7 @@
 #' 0.99997 in the natural units. For several test types, this parameter
 #' corresponds to `1 - {p-value}`.
 #' @export
-conditional_min_criterion <- function(range = c(1.386294, 15), trans = scales::logit_trans()) {
+conditional_min_criterion <- function(range = c(1.386294, 15), trans = scales::transform_logit()) {
   dials::new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_engine_ranger.R b/R/param_engine_ranger.R
@@ -43,7 +43,7 @@ regularize_depth <- function(values = c(TRUE, FALSE)) {
 
 #' @export
 #' @rdname ranger_parameters
-significance_threshold <- function(range = c(-10, 0), trans = log10_trans()) {
+significance_threshold <- function(range = c(-10, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_engine_xgboost.R b/R/param_engine_xgboost.R
@@ -28,7 +28,7 @@ scale_pos_weight <- function(range = c(0.8, 1.2), trans = NULL) {
 
 #' @rdname xgboost_parameters
 #' @export
-penalty_L2 <- function(range = c(-10, 1), trans = log10_trans()) {
+penalty_L2 <- function(range = c(-10, 1), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,
@@ -41,7 +41,7 @@ penalty_L2 <- function(range = c(-10, 1), trans = log10_trans()) {
 
 #' @rdname xgboost_parameters
 #' @export
-penalty_L1 <- function(range = c(-10, 1), trans = log10_trans()) {
+penalty_L1 <- function(range = c(-10, 1), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_kernel.R b/R/param_kernel.R
@@ -10,7 +10,7 @@
 #' scale_factor()
 #' kernel_offset()
 #' @export
-rbf_sigma <- function(range = c(-10, 0), trans = log10_trans()) {
+rbf_sigma <- function(range = c(-10, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,
@@ -23,7 +23,7 @@ rbf_sigma <- function(range = c(-10, 0), trans = log10_trans()) {
 
 #' @rdname rbf_sigma
 #' @export
-scale_factor <- function(range = c(-10, -1), trans = log10_trans()) {
+scale_factor <- function(range = c(-10, -1), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_learn_rate.R b/R/param_learn_rate.R
@@ -12,7 +12,7 @@
 #' @examples
 #' learn_rate()
 #' @export
-learn_rate <- function(range = c(-10, -1), trans = log10_trans()) {
+learn_rate <- function(range = c(-10, -1), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_min_dist.R b/R/param_min_dist.R
@@ -6,7 +6,7 @@
 #' @examples
 #' min_dist()
 #' @export
-min_dist <- function(range = c(-4, 0), trans = log10_trans()) {
+min_dist <- function(range = c(-4, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_mtry.R b/R/param_mtry.R
@@ -31,7 +31,7 @@ mtry <- function(range = c(1L, unknown()), trans = NULL) {
 
 #' @export
 #' @rdname mtry
-mtry_long <- function(range = c(0L, unknown()), trans = log10_trans()) {
+mtry_long <- function(range = c(0L, unknown()), trans = transform_log10()) {
   new_quant_param(
     type = "integer",
     range = range,

diff --git a/R/param_network.R b/R/param_network.R
@@ -53,7 +53,7 @@ hidden_units <- function(range = c(1L, 10L), trans = NULL) {
 
 #' @export
 #' @rdname dropout
-batch_size <- function(range = c(unknown(), unknown()), trans = log2_trans()) {
+batch_size <- function(range = c(unknown(), unknown()), trans = transform_log2()) {
   new_quant_param(
     type = "integer",
     range = range,

diff --git a/R/param_num_hash.R b/R/param_num_hash.R
@@ -9,7 +9,7 @@
 #' signed_hash()
 #' @export
 #' @rdname texthash
-num_hash <- function(range = c(8L, 12L), trans = log2_trans()) {
+num_hash <- function(range = c(8L, 12L), trans = transform_log2()) {
   new_quant_param(
     type = "integer",
     range = range,

diff --git a/R/param_penalty.R b/R/param_penalty.R
@@ -11,7 +11,7 @@
 #' @examples
 #' penalty()
 #' @export
-penalty <- function(range = c(-10, 0), trans = log10_trans()) {
+penalty <- function(range = c(-10, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_schedulers.R b/R/param_schedulers.R
@@ -20,7 +20,7 @@
 #'
 #' @name scheduler-param
 #' @export
-rate_initial <- function (range = c(-3,-1), trans = log10_trans()) {
+rate_initial <- function (range = c(-3,-1), trans = transform_log10()) {
     new_quant_param(
       type = "double",
       range = range,
@@ -33,7 +33,7 @@ rate_initial <- function (range = c(-3,-1), trans = log10_trans()) {
 
 #' @rdname scheduler-param
 #' @export
-rate_largest <- function (range = c(-1, -1 / 2), trans = log10_trans()) {
+rate_largest <- function (range = c(-1, -1 / 2), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_sparse_bayes_pca.R b/R/param_sparse_bayes_pca.R
@@ -16,7 +16,7 @@
 #' @examples
 #' mixture()
 #' @export
-prior_slab_dispersion <- function(range = c(-1/2, log10(3)), trans = log10_trans()) {
+prior_slab_dispersion <- function(range = c(-1/2, log10(3)), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_svm.R b/R/param_svm.R
@@ -7,7 +7,7 @@
 #' cost()
 #' svm_margin()
 #' @export
-cost <- function(range = c(-10, 5), trans = log2_trans()) {
+cost <- function(range = c(-10, 5), trans = transform_log2()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_trees.R b/R/param_trees.R
@@ -96,7 +96,7 @@ sample_prop <- function(range = c(1/10, 1), trans = NULL) {
 
 #' @rdname trees
 #' @export
-loss_reduction <- function(range = c(-10, 1.5), trans = log10_trans()) {
+loss_reduction <- function(range = c(-10, 1.5), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,
@@ -133,7 +133,7 @@ prune <- function(values = c(TRUE, FALSE)) {
 
 #' @export
 #' @rdname trees
-cost_complexity <- function(range = c(-10, -1), trans = log10_trans()) {
+cost_complexity <- function(range = c(-10, -1), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/param_weight.R b/R/param_weight.R
@@ -6,7 +6,7 @@
 #' @examples
 #' weight()
 #' @export
-weight <- function(range = c(-10, 0), trans = log10_trans()) {
+weight <- function(range = c(-10, 0), trans = transform_log10()) {
   new_quant_param(
     type = "double",
     range = range,

diff --git a/R/space_filling.R b/R/space_filling.R
@@ -35,7 +35,7 @@
 #'   penalty(),
 #'   epochs(),
 #'   activation(),
-#'   learn_rate(c(0, 1), trans = scales::log_trans()),
+#'   learn_rate(c(0, 1), trans = scales::transform_log()),
 #'   size = 10,
 #'   original = FALSE
 #' )

diff --git a/man/Laplace.Rd b/man/Laplace.Rd
diff --git a/man/adjust_deg_free.Rd b/man/adjust_deg_free.Rd
diff --git a/man/bart-param.Rd b/man/bart-param.Rd
diff --git a/man/c5_parameters.Rd b/man/c5_parameters.Rd
diff --git a/man/class_weights.Rd b/man/class_weights.Rd
diff --git a/man/conditional_min_criterion.Rd b/man/conditional_min_criterion.Rd
diff --git a/man/cost.Rd b/man/cost.Rd
diff --git a/man/cubist_parameters.Rd b/man/cubist_parameters.Rd
diff --git a/man/deg_free.Rd b/man/deg_free.Rd
diff --git a/man/degree.Rd b/man/degree.Rd
diff --git a/man/dist_power.Rd b/man/dist_power.Rd
diff --git a/man/dropout.Rd b/man/dropout.Rd
diff --git a/man/earth_parameters.Rd b/man/earth_parameters.Rd