fix for #187

Author: topepo

R/mars.R

@@ -59,7 +59,6 @@
 #' @examples
 #' mars(mode = "regression", num_terms = 5)
 #' @export
-
 mars <-
   function(mode = "unknown",
            num_terms = NULL, prod_degree = NULL, prune_method = NULL) {
@@ -149,7 +148,7 @@ translate.mars <- function(x, engine = x$engine, ...) {
   # see if it is there and, if not, add the default value.
   if (x$mode == "classification") {
     if (!("glm" %in% names(x$eng_args))) {
-      x$eng_args$glm <- quote(list(family = stats::binomial))
+      x$eng_args$glm <- rlang::quo(list(family = stats::binomial))
     }
   }
 
@@ -193,8 +192,8 @@ earth_reg_updater <- function(num, object, new_data, ...) {
   if (ncol(pred) == 1) {
     res <- tibble::tibble(.pred = pred[, 1], nprune = num)
   } else {
-    res <- tibble::as_tibble(res)
     names(res) <- paste0(".pred_", names(res))
+    res <- tibble::as_tibble(res)
     res$nprune <- num
   }
   res

tests/testthat/test_mars.R

@@ -29,7 +29,7 @@ test_that('primary arguments', {
                  y = expr(missing_arg()),
                  weights = expr(missing_arg()),
                  nprune = new_empty_quosure(4),
-                 glm = expr(list(family = stats::binomial)),
+                 glm = rlang::quo(list(family = stats::binomial)),
                  keepxy = TRUE
                )
   )
@@ -244,6 +244,7 @@ test_that('submodel prediction', {
   cls_fit <- class_fit$fit
   cls_fit$call[["pmethod"]] <- eval_tidy(cls_fit$call[["pmethod"]])
   cls_fit$call[["keepxy"]]  <- eval_tidy(cls_fit$call[["keepxy"]])
+  cls_fit$call[["glm"]]  <- eval_tidy(cls_fit$call[["glm"]])
 
   pruned_cls <- update(cls_fit, nprune = 5)
   pruned_cls_pred <- predict(pruned_cls, wa_churn[1:4, vars], type = "response")[,1]