better checks for interface issues (made to me model-specific)

Author: topepo

R/fit.R

@@ -111,7 +111,7 @@ fit.model_spec <-
   ) {
     cl <- match.call(expand.dots = TRUE)
     fit_interface <-
-      check_interface(formula, recipe, x, y, data, cl)
+      check_interface(formula, recipe, x, y, data, cl, object)
     object$engine <- engine
     object <- check_engine(object)
 
@@ -210,7 +210,7 @@ show_call <- function(x)
 has_both_or_none <- function(a, b)
   (!is.null(a) & is.null(b)) | (is.null(a) & !is.null(b))
 
-check_interface <- function(formula, recipe, x, y, data, cl) {
+check_interface <- function(formula, recipe, x, y, data, cl, model) {
   inher(formula, "formula", cl)
   inher(recipe, "recipe", cl)
   inher(x, c("data.frame", "matrix", "tbl_spark"), cl)
@@ -238,6 +238,10 @@ check_interface <- function(formula, recipe, x, y, data, cl) {
     stop("Too many specifications of arguments; used either 'x/y', ",
          "'formula/data', or 'recipe/data' combinations.", call. = FALSE)
 
+  if (inherits(model, "surv_reg") &&
+      (matrix_interface | df_interface))
+    stop("Survival models must use the formula or recipe interface.", call. = FALSE)
+
   if (matrix_interface)
     return("data.frame")
   if (df_interface)

tests/testthat/test_fit_interfaces.R

@@ -6,26 +6,30 @@ library(rlang)
 rec <- recipe(~ ., data = iris)
 f <- y ~ x
 
+smod <- surv_reg()
+rmod <- linear_reg()
+
 tester <-
-  function(object, formula = NULL, recipe = NULL, x = NULL, y = NULL, data = NULL)
-    parsnip:::check_interface(formula, recipe, x, y, data, match.call(expand.dots = TRUE))
+  function(object, formula = NULL, recipe = NULL, x = NULL, y = NULL, data = NULL, model)
+    parsnip:::check_interface(formula, recipe, x, y, data, match.call(expand.dots = TRUE), model)
 
 test_that('good args', {
-  expect_equal(tester(NULL, formula = f, data = iris), "formula")
-  expect_equal(tester(NULL, recipe = rec, data = iris), "recipe")
-  expect_equal(tester(NULL, x = iris, y = iris), "data.frame")
-  expect_equal(tester(NULL, f, data = iris), "formula")
-  expect_equal(tester(NULL, formula = f, data = iris, y = iris), "formula")
+  expect_equal(tester(NULL, formula = f, data = iris, model = rmod), "formula")
+  expect_equal(tester(NULL, recipe = rec, data = iris, model = rmod), "recipe")
+  expect_equal(tester(NULL, x = iris, y = iris, model = rmod), "data.frame")
+  expect_equal(tester(NULL, f, data = iris, model = rmod), "formula")
+  expect_equal(tester(NULL, formula = f, data = iris, y = iris, model = rmod), "formula")
 })
 
 test_that('unnamed args', {
-  expect_error(tester(NULL, rec, data = iris))
-  expect_error(tester(NULL, iris, y = iris))
-  expect_error(tester(NULL, data = iris))
+  expect_error(tester(NULL, rec, data = iris, model = rmod))
+  expect_error(tester(NULL, iris, y = iris, model = rmod))
+  expect_error(tester(NULL, data = iris, model = rmod))
 })
 
 test_that('wrong args', {
-  expect_error(tester(NULL, x = iris, data = iris))
+  expect_error(tester(NULL, x = iris, data = iris, model = rmod))
+  expect_error(tester(NULL, x = iris, y = iris$Sepal.Length, model = smod))
   expect_error(tester(NULL, f,  x = iris, y = iris, data = iris))
 })