Merge branch 'main' into respect-inclusive-347

Author: hfrick

NEWS.md

@@ -13,10 +13,14 @@
 
 * `value_seq()` and `value_sample()` now respect the `inclusive` argument of quantitative parameters (#347).
 
+* The constructors, `new_*_parameter()`, now label unlabeled parameter (i.e., constructed with `label = NULL`) as such (#349).
+
 ## Breaking changes
 
 * The `grid_*()` functions now error instead of warn when provided with the wrong argument to control the grid size. So `grid_space_filling()`, `grid_random()`, `grid_max_entropy()`, and `grid_latin_hypercube()` now error if used with a `levels` argument and `grid_regular()` now errors if used with a `size` argument (#368).
 
+* The `"optimal"` option for the `weight_func()` parameter has been removed since it is choosing the optimal value based on the resubstition error (#370). 
+
 * When constructing integer-valued parameters with a range of two consecutive values the `inclusive` argument needs to be set to `c(TRUE, TRUE)` to leave at least two values to sample from (#373). 
 
 

R/constructors.R

@@ -32,8 +32,9 @@
 #' If set, these will be used by [value_seq()] and [value_sample()].
 #'
 #' @param label An optional named character string that can be used for
-#' printing and plotting. The name should match the object name (e.g.
-#' `"mtry"`, `"neighbors"`, etc.)
+#' printing and plotting. The name of the label should match the object name 
+#' (e.g., `"mtry"`, `"neighbors"`, etc.). If `NULL`, the parameter will be 
+#' labeled with `"Unlabeled parameter"`.
 #'
 #' @param finalize A function that can be used to set the data-specific
 #' values of a parameter (such as the `range`).
@@ -76,16 +77,18 @@ NULL
 
 #' @export
 #' @rdname new-param
-new_quant_param <- function(type = c("double", "integer"),
-                            range = NULL,
-                            inclusive = NULL,
-                            default = deprecated(),
-                            trans = NULL,
-                            values = NULL,
-                            label = NULL,
-                            finalize = NULL,
-                            ...,
-                            call = caller_env()) {
+new_quant_param <- function(
+  type = c("double", "integer"),
+  range = NULL,
+  inclusive = NULL,
+  default = deprecated(),
+  trans = NULL,
+  values = NULL,
+  label = NULL,
+  finalize = NULL,
+  ...,
+  call = caller_env()
+) {
   if (lifecycle::is_present(default)) {
     lifecycle::deprecate_stop(
       when = "1.1.0",
@@ -156,6 +159,11 @@ new_quant_param <- function(type = c("double", "integer"),
   }
 
   check_label(label, call = call)
+  if (is.null(label)) {
+    label = "Unlabeled parameter"
+    names(label) <- "Unlabeled parameter"
+  }
+
   check_function(finalize, allow_null = TRUE, call = call)
 
   names(range) <- names(inclusive) <- c("lower", "upper")
@@ -189,16 +197,18 @@ new_quant_param <- function(type = c("double", "integer"),
 
 #' @export
 #' @rdname new-param
-new_qual_param <- function(type = c("character", "logical"),
-                           values,
-                           default = deprecated(),
-                           label = NULL,
-                           finalize = NULL,
-                           ...,
-                           call = caller_env()) {
+new_qual_param <- function(
+  type = c("character", "logical"),
+  values,
+  default = deprecated(),
+  label = NULL,
+  finalize = NULL,
+  ...,
+  call = caller_env()
+) {
   if (lifecycle::is_present(default)) {
     lifecycle::deprecate_stop(
-      when = "1.1.0", 
+      when = "1.1.0",
       what = "new_qual_param(default)"
     )
   }
@@ -210,7 +220,13 @@ new_qual_param <- function(type = c("character", "logical"),
     "logical" = check_logical(values, call = call),
     "character" = check_character(values, call = call)
   )
+
   check_label(label, call = call)
+  if (is.null(label)) {
+    label = "Unlabeled parameter"
+    names(label) <- "Unlabeled parameter"
+  }
+
   check_function(finalize, allow_null = TRUE, call = call)
 
   res <- list(

R/param_activation.R

@@ -31,4 +31,9 @@ activation_2 <- function(values = values_activation) {
 
 #' @rdname activation
 #' @export
-values_activation <- c("linear", "softmax", "relu", "elu", "tanh")
+values_activation <- c("celu", "elu", "exponential", "gelu", "hardshrink", 
+  "hardsigmoid", "hardtanh", "leaky_relu", "linear", "log_sigmoid", "relu", 
+  "relu6", "rrelu", "selu", "sigmoid", "silu", "softmax", "softplus", 
+  "softshrink", "softsign", "swish", "tanh", "tanhshrink"
+)
+# sort(unique(c(brulee::brulee_activations(), parsnip::keras_activations())))

R/param_weight_func.R

@@ -29,6 +29,5 @@ values_weight_func <- c(
   "cos",
   "inv",
   "gaussian",
-  "rank",
-  "optimal"
+  "rank"
 )

man/activation.Rd

@@ -205,9 +205,9 @@
       print(fun_ish)
     Message
       Qualitative Parameter
-      10 possible values include:
+      9 possible values include:
       'rectangular', 'triangular', 'epanechnikov', 'biweight', 'triweight', 'cos',
-      'inv', 'gaussian', 'rank', and 'optimal'
+      'inv', 'gaussian', and 'rank'
 
 ---