changes the "others" slot to "eng_args"

Author: topepo

NEWS.md

@@ -1,3 +1,8 @@
+# parsnip 0.0.0.9005
+
+* The engine, and any associated arguments, are not specified using `set_engine`. There is no `engine` argument 
+
+
 # parsnip 0.0.0.9004
 
 * Arguments to modeling functions are now captured as quosures. 

R/arguments.R

@@ -50,7 +50,7 @@ prune_arg_list <- function(x, whitelist = NULL, modified = character(0)) {
   x
 }
 
-check_others <- function(args, obj, core_args) {
+check_eng_args <- function(args, obj, core_args) {
   # Make sure that we are not trying to modify an argument that
   # is explicitly protected in the method metadata or arg_key
   protected_args <- unique(c(obj$protect, core_args))
@@ -95,7 +95,7 @@ set_args <- function(object, ...) {
     if (any(main_args == i)) {
       object$args[[i]] <- the_dots[[i]]
     } else {
-      object$others[[i]] <- the_dots[[i]]
+      object$eng_args[[i]] <- the_dots[[i]]
     }
   }
   object
@@ -130,6 +130,6 @@ maybe_eval <- function(x) {
 
 eval_args <- function(spec, ...) {
   spec$args   <- purrr::map(spec$args,   maybe_eval)
-  spec$others <- purrr::map(spec$others, maybe_eval)
+  spec$eng_args <- purrr::map(spec$eng_args, maybe_eval)
   spec
 }

R/boost_tree.R

@@ -127,7 +127,7 @@ boost_tree <-
            paste0("'", boost_tree_modes, "'", collapse = ", "),
            call. = FALSE)
 
-    out <- list(args = args, others = NULL,
+    out <- list(args = args, eng_args = NULL,
                 mode = mode, method = NULL, engine = NULL)
     class(out) <- make_classes("boost_tree")
     out

R/convert_data.R

@@ -76,7 +76,7 @@ convert_form_to_xy_fit <-function(
   if (indicators) {
     x <- model.matrix(mod_terms, mod_frame, contrasts)
   } else {
-    # this still ignores -vars in formula ¯\_(ツ)_/¯
+    # this still ignores -vars in formula
     x <- model.frame(mod_terms, data)
     y_cols <- attr(mod_terms, "response")
     if (length(y_cols) > 0)

R/descriptors.R

@@ -318,11 +318,11 @@ make_descr <- function(object) {
     expr_main <- map_lgl(object$args, has_exprs)
   else
     expr_main <- FALSE
-  if (length(object$others) > 0)
-    expr_others <- map_lgl(object$others, has_exprs)
+  if (length(object$eng_args) > 0)
+    expr_eng_args <- map_lgl(object$eng_args, has_exprs)
   else
-    expr_others <- FALSE
-  any(expr_main) | any(expr_others)
+    expr_eng_args <- FALSE
+  any(expr_main) | any(expr_eng_args)
 }
 
 # Locate descriptors -----------------------------------------------------------
@@ -331,7 +331,7 @@ make_descr <- function(object) {
 requires_descrs <- function(object) {
   any(c(
     map_lgl(object$args, has_any_descrs),
-    map_lgl(object$others, has_any_descrs)
+    map_lgl(object$eng_args, has_any_descrs)
   ))
 }
 

R/engines.R

@@ -81,6 +81,6 @@ set_engine <- function(object, engine, ...) {
   object <- check_engine(object)
 
 
-  object$others  <- enquos(...)
+  object$eng_args  <- enquos(...)
   object
 }

R/linear_reg.R

@@ -117,7 +117,7 @@ linear_reg <-
     # write a constructor function
     out <- list(
       args = args,
-      others = NULL,
+      eng_args = NULL,
       mode = mode,
       method = NULL,
       engine = NULL

R/logistic_reg.R

@@ -116,7 +116,7 @@ logistic_reg <-
     # write a constructor function
     out <- list(
       args = args,
-      others = NULL,
+      eng_args = NULL,
       mode = mode,
       method = NULL,
       engine = NULL

R/mars.R

@@ -75,7 +75,7 @@ mars <-
            paste0("'", mars_modes, "'", collapse = ", "),
            call. = FALSE)
 
-    out <- list(args = args, others = NULL,
+    out <- list(args = args, eng_args = NULL,
                 mode = mode, method = NULL, engine = NULL)
     class(out) <- make_classes("mars")
     out
@@ -141,8 +141,8 @@ translate.mars <- function(x, engine = x$engine, ...) {
   # If classification is being done, the `glm` options should be used. Check to
   # see if it is there and, if not, add the default value.
   if (x$mode == "classification") {
-    if (!("glm" %in% names(x$others))) {
-      x$others$glm <- quote(list(family = stats::binomial))
+    if (!("glm" %in% names(x$eng_args))) {
+      x$eng_args$glm <- quote(list(family = stats::binomial))
     }
   }
 
@@ -208,8 +208,8 @@ multi_predict._earth <-
     msg <-
       paste("Please use `keepxy = TRUE` as an option to enable submodel",
             "predictions with `earth`.")
-    if (any(names(object$spec$others) == "keepxy")) {
-      if(!object$spec$others$keepxy)
+    if (any(names(object$spec$eng_args) == "keepxy")) {
+      if(!object$spec$eng_args$keepxy)
         stop (msg, call. = FALSE)
     } else
       stop (msg, call. = FALSE)

R/misc.R

@@ -18,7 +18,7 @@ make_classes <- function(prefix) {
 check_empty_ellipse <- function (...)  {
   terms <- quos(...)
   if (!is_empty(terms))
-    stop("Please pass other arguments to the model function via `others`", call. = FALSE)
+    stop("Please pass other arguments to the model function via `set_engine`", call. = FALSE)
   terms
 }
 
@@ -35,7 +35,6 @@ deparserizer <- function(x, limit = options()$width - 10) {
 }
 
 print_arg_list <- function(x, ...) {
-  others <- c("name", "call", "expression")
   atomic <- vapply(x, is.atomic, logical(1))
   x2 <- x
   x2[!atomic] <-  lapply(x2[!atomic], deparserizer, ...)
@@ -59,10 +58,10 @@ model_printer <- function(x, ...) {
     non_null_args <- map(non_null_args, convert_arg)
     cat(print_arg_list(non_null_args), "\n", sep = "")
   }
-  if (length(x$others) > 0) {
+  if (length(x$eng_args) > 0) {
     cat("Engine-Specific Arguments:\n")
-    x$others <- map(x$others, convert_arg)
-    cat(print_arg_list(x$others), "\n", sep = "")
+    x$eng_args <- map(x$eng_args, convert_arg)
+    cat(print_arg_list(x$eng_args), "\n", sep = "")
   }
   if (!is.null(x$engine)) {
     cat("Computational engine:", x$engine, "\n\n")