use check_ functions for penalty

Author: EmilHvitfeldt

R/discrim_linear.R

@@ -84,12 +84,7 @@ check_args.discrim_linear <- function(object, call = rlang::caller_env()) {
 
   args <- lapply(object$args, rlang::eval_tidy)
 
-  if (all(is.numeric(args$penalty)) && any(args$penalty < 0)) {
-    cli::cli_abort(
-      "The amount of regularization, {.arg penalty}, should be {.code >= 0}.",
-      call = call
-    )
-  }
+  check_number_decimal(args$penalty, min = 0, allow_null = TRUE, call = call, arg = "penalty")
 
   invisible(object)
 }

R/linear_reg.R

@@ -111,13 +111,7 @@ check_args.linear_reg <- function(object, call = rlang::caller_env()) {
   args <- lapply(object$args, rlang::eval_tidy)
 
   check_number_decimal(args$mixture, min = 0, max = 1, allow_null = TRUE, call = call, arg = "mixture")
-
-  if (all(is.numeric(args$penalty)) && any(args$penalty < 0)) {
-    cli::cli_abort(
-      "The amount of regularization, {.arg penalty}, should be {.code >= 0}.",
-      call = call
-    )
-  }
+  check_number_decimal(args$penalty, min = 0, allow_null = TRUE, call = call, arg = "penalty")
 
   invisible(object)
 }

R/logistic_reg.R

@@ -140,12 +140,7 @@ check_args.logistic_reg <- function(object, call = rlang::caller_env()) {
   args <- lapply(object$args, rlang::eval_tidy)
 
   check_number_decimal(args$mixture, min = 0, max = 1, allow_null = TRUE, call = call, arg = "mixture")
-
-  if (all(is.numeric(args$penalty)) && any(args$penalty < 0))
-    cli::cli_abort(
-      "The amount of regularization, {.arg penalty}, should be {.code >= 0}.",
-      call = call
-    )
+  check_number_decimal(args$penalty, min = 0, allow_null = TRUE, call = call, arg = "penalty")
 
   if (object$engine == "LiblineaR") {
     if (is.numeric(args$mixture) && !args$mixture %in% 0:1) {

R/multinom_reg.R

@@ -105,13 +105,8 @@ check_args.multinom_reg <- function(object, call = rlang::caller_env()) {
   args <- lapply(object$args, rlang::eval_tidy)
 
   check_number_decimal(args$mixture, min = 0, max = 1, allow_null = TRUE, call = call, arg = "mixture")
+  check_number_decimal(args$penalty, min = 0, allow_null = TRUE, call = call, arg = "penalty")
 
-  if (all(is.numeric(args$penalty)) && any(args$penalty < 0)) {
-    cli::cli_abort(
-      "The amount of regularization, {.arg penalty}, should be {.code >= 0}.",
-      call = call
-    )
-  }
   invisible(object)
 }
 

R/poisson_reg.R

@@ -106,13 +106,7 @@ check_args.poisson_reg <- function(object, call = rlang::caller_env()) {
   args <- lapply(object$args, rlang::eval_tidy)
 
   check_number_decimal(args$mixture, min = 0, max = 1, allow_null = TRUE, call = call, arg = "mixture")
-
-  if (all(is.numeric(args$penalty)) && any(args$penalty < 0)) {
-    cli::cli_abort(
-      "The amount of regularization, {.arg penalty}, should be {.code >= 0}.",
-      call = call
-    )
-  }
+  check_number_decimal(args$penalty, min = 0, allow_null = TRUE, call = call, arg = "penalty")
 
   invisible(object)
 }

tests/testthat/_snaps/linear_reg.md

@@ -39,5 +39,5 @@
       fit(spec, compounds ~ ., hpc)
     Condition
       Error in `fit()`:
-      ! The amount of regularization, `penalty`, should be `>= 0`.
+      ! `penalty` must be a number larger than or equal to 0 or `NULL`, not the number -1.
 

tests/testthat/_snaps/logistic_reg.md

@@ -47,7 +47,7 @@
       fit(spec, Class ~ ., lending_club)
     Condition
       Error in `fit()`:
-      ! The amount of regularization, `penalty`, should be `>= 0`.
+      ! `penalty` must be a number larger than or equal to 0 or `NULL`, not the number -1.
 
 ---
 

tests/testthat/_snaps/multinom_reg.md

@@ -33,5 +33,5 @@
       fit(spec, class ~ ., hpc)
     Condition
       Error in `fit()`:
-      ! The amount of regularization, `penalty`, should be `>= 0`.
+      ! `penalty` must be a number larger than or equal to 0 or `NULL`, not the number -1.