Merge pull request #382 from tidymodels/glmnet-column-fix

Reorder columns at prediction time for glmnet

Author: topepo

R/linear_reg_data.R

@@ -168,7 +168,7 @@ set_pred(
     args =
       list(
         object = expr(object$fit),
-        newx = expr(as.matrix(new_data)),
+        newx = expr(as.matrix(new_data[, rownames(object$fit$beta)])),
         type = "response",
         s = expr(object$spec$args$penalty)
       )

R/logistic_reg_data.R

@@ -186,10 +186,10 @@ set_pred(
     func = c(fun = "predict"),
     args =
       list(
-        object = quote(object$fit),
-        newx = quote(as.matrix(new_data)),
+        object = expr(object$fit),
+        newx = expr(as.matrix(new_data[, rownames(object$fit$beta)])),
         type = "response",
-        s = quote(object$spec$args$penalty)
+        s = expr(object$spec$args$penalty)
       )
   )
 )

R/multinom_reg_data.R

@@ -61,7 +61,7 @@ set_pred(
     args =
       list(
         object = quote(object$fit),
-        newx = quote(as.matrix(new_data)),
+        newx = quote(as.matrix(new_data[, rownames(object$fit$beta[[1]])])),
         type = "class",
         s = quote(object$spec$args$penalty)
       )
@@ -79,10 +79,10 @@ set_pred(
     func = c(fun = "predict"),
     args =
       list(
-        object = quote(object$fit),
-        newx = quote(as.matrix(new_data)),
+        object = expr(object$fit),
+        newx = expr(as.matrix(new_data[, rownames(object$fit$beta[[1]])])),
         type = "response",
-        s = quote(object$spec$args$penalty)
+        s = expr(object$spec$args$penalty)
       )
   )
 )