Merge pull request #445 from tidymodels/restrict-fit_xy

restrict `fit_xy()` from working for censored regression models

Author: topepo

NEWS.md

@@ -20,6 +20,7 @@
 
 * New mode "censored regression" and new prediction types "linear_pred", "time", "survival", "hazard". (#396)
 
+* Censored regression models cannot use `fit_xy()` (use `fit()`). (#442)
 
 # parsnip 0.1.4
 

R/fit.R

@@ -192,6 +192,14 @@ fit_xy.model_spec <-
            control = control_parsnip(),
            ...
   ) {
+    if (object$mode == "censored regression") {
+      rlang::abort("Models for censored regression must use the formula interface.")
+    }
+
+    if (inherits(object, "surv_reg")) {
+      rlang::abort("Survival models must use the formula interface.")
+    }
+
     if (!identical(class(control), class(control_parsnip()))) {
       rlang::abort("The 'control' argument should have class 'control_parsnip'.")
     }
@@ -388,10 +396,6 @@ check_xy_interface <- function(x, y, cl, model) {
 
   df_interface <- !is.null(x) & !is.null(y) && is.data.frame(x)
 
-  if (inherits(model, "surv_reg") && (matrix_interface | df_interface)) {
-    rlang::abort("Survival models must use the formula interface.")
-  }
-
   if (matrix_interface) {
     return("matrix")
   }

tests/testthat/test_fit_interfaces.R

@@ -8,7 +8,6 @@ hpc <- hpc_data[1:150, c(2:5, 8)]
 
 f <- y ~ x
 
-smod <- surv_reg()
 rmod <- linear_reg()
 
 sprk <- 1:10
@@ -36,7 +35,6 @@ test_that('good args', {
 #
 test_that('wrong args', {
  expect_error(tester_xy(NULL, x = sprk, y = hpc, model = rmod))
- expect_error(tester_xy(NULL, x = hpc, y = hpc$compounds, model = smod))
  expect_error(tester(NULL, f,  data = as.matrix(hpc[, 1:4])))
 })