Merge branch 'sparsity' of https://github.com/tidymodels/parsnip into sparsity

topepo · topepo · commit 4083321b7931 · 2020-10-05T16:00:38.000-04:00
diff --git a/R/fit.R b/R/fit.R
@@ -370,9 +370,9 @@ check_xy_interface <- function(x, y, cl, model) {
 
 
   if (sparse_ok) {
-    matrix_interface <- !is.null(x) & !is.null(y) && (is.matrix(x) | sparse_x)
+    matrix_interface <- !is.null(x) && !is.null(y) && (is.matrix(x) | sparse_x)
   } else {
-    matrix_interface <- !is.null(x) & !is.null(y) && is.matrix(x)
+    matrix_interface <- !is.null(x) && !is.null(y) && is.matrix(x)
   }
 
   df_interface <- !is.null(x) & !is.null(y) && is.data.frame(x)
@@ -408,4 +408,3 @@ print.model_fit <- function(x, ...) {
   }
   invisible(x)
 }
-

Original file line number	Diff line number	Diff line change
`@@ -370,9 +370,9 @@ check_xy_interface <- function(x, y, cl, model) {`
`370`	`370`
`371`	`371`
`372`	`372`	`if (sparse_ok) {`
`373`		`- matrix_interface <- !is.null(x) & !is.null(y) && (is.matrix(x) \| sparse_x)`
	`373`	`+ matrix_interface <- !is.null(x) && !is.null(y) && (is.matrix(x) \| sparse_x)`
`374`	`374`	`} else {`
`375`		`- matrix_interface <- !is.null(x) & !is.null(y) && is.matrix(x)`
	`375`	`+ matrix_interface <- !is.null(x) && !is.null(y) && is.matrix(x)`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`df_interface <- !is.null(x) & !is.null(y) && is.data.frame(x)`
`@@ -408,4 +408,3 @@ print.model_fit <- function(x, ...) {`
`408`	`408`	`}`
`409`	`409`	`invisible(x)`
`410`	`410`	`}`
`411`		`-`