tidymodels · topepo · Dec 14, 2019 · Dec 10, 2019 · Dec 14, 2019
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -49,4 +49,5 @@ Suggests:
     ranger,
     rpart,
     MASS,
-    nlme
+    nlme,
+    modeldata
diff --git a/R/data.R b/R/data.R
diff --git a/R/descriptors.R b/R/descriptors.R
@@ -58,6 +58,7 @@
 #'
 #' \preformatted{
 #'
+#' library(modeldata)
 #' data("lending_club")
 #'
 #' rand_forest(mode = "classification", mtry = .cols() - 2)

diff --git a/R/fit.R b/R/fit.R
@@ -48,6 +48,7 @@
 #' # methods for specifying the model can be used
 #'
 #' library(dplyr)
+#' library(modeldata)
 #' data("lending_club")
 #'
 #' lr_mod <- logistic_reg()

diff --git a/R/predict.R b/R/predict.R
@@ -229,7 +229,12 @@ prepare_data <- function(object, new_data) {
       new_data <- convert_form_to_xy_new(object$preproc, new_data)$x
     }
   }
-
-  new_data
+  switch(
+    fit_interface,
+    none = new_data,
+    data.frame = as.data.frame(new_data),
+    matrix = as.matrix(new_data),
+    new_data
+  )
 }
 
diff --git a/data/check_times.rda b/data/check_times.rda
diff --git a/data/datalist b/data/datalist
diff --git a/data/lending_club.rda b/data/lending_club.rda
diff --git a/data/wa_churn.rda b/data/wa_churn.rda
diff --git a/man/check_times.Rd b/man/check_times.Rd
diff --git a/man/descriptors.Rd b/man/descriptors.Rd
diff --git a/man/fit.Rd b/man/fit.Rd
diff --git a/man/lending_club.Rd b/man/lending_club.Rd
diff --git a/man/wa_churn.Rd b/man/wa_churn.Rd
diff --git a/tests/testthat/helper-objects.R b/tests/testthat/helper-objects.R
@@ -1,3 +1,10 @@
+library(modeldata)
+
+data("wa_churn")
+data("lending_club")
+
+# ------------------------------------------------------------------------------
+
 ctrl          <- control_parsnip(verbosity = 1, catch = FALSE)
 caught_ctrl   <- control_parsnip(verbosity = 1, catch = TRUE)
 quiet_ctrl    <- control_parsnip(verbosity = 0, catch = TRUE)

diff --git a/tests/testthat/test_boost_tree_C50.R b/tests/testthat/test_boost_tree_C50.R
@@ -8,7 +8,6 @@ library(dplyr)
 context("boosted tree execution with C5.0")
 source("helper-objects.R")
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 lending_club_fail <-
   lending_club %>%

diff --git a/tests/testthat/test_failed_models.R b/tests/testthat/test_failed_models.R
@@ -13,8 +13,6 @@ iris_bad <-
   iris %>%
   mutate(big_num = Inf)
 
-data("lending_club")
-
 lending_club <-
   lending_club %>%
   dplyr::slice(1:200) %>%

diff --git a/tests/testthat/test_logistic_reg.R b/tests/testthat/test_logistic_reg.R
@@ -215,7 +215,6 @@ test_that('bad input', {
 
 # ------------------------------------------------------------------------------
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 lc_form <- as.formula(Class ~ log(funded_amnt) + int_rate)
 num_pred <- c("funded_amnt", "annual_inc", "num_il_tl")

diff --git a/tests/testthat/test_logistic_reg_glmnet.R b/tests/testthat/test_logistic_reg_glmnet.R
@@ -9,7 +9,6 @@ library(tidyr)
 context("logistic regression execution with glmnet")
 source("helper-objects.R")
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 lc_form <- as.formula(Class ~ log(funded_amnt) + int_rate)
 num_pred <- c("funded_amnt", "annual_inc", "num_il_tl")

diff --git a/tests/testthat/test_logistic_reg_keras.R b/tests/testthat/test_logistic_reg_keras.R
@@ -11,7 +11,6 @@ source("helpers.R")
 
 # ------------------------------------------------------------------------------
 
-data("lending_club")
 set.seed(352)
 dat <-
   lending_club %>%

diff --git a/tests/testthat/test_logistic_reg_stan.R b/tests/testthat/test_logistic_reg_stan.R
@@ -8,7 +8,6 @@ library(tibble)
 context("execution tests for stan logistic regression")
 source("helper-objects.R")
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 lc_form <- as.formula(Class ~ log(funded_amnt) + int_rate)
 num_pred <- c("funded_amnt", "annual_inc", "num_il_tl")

diff --git a/tests/testthat/test_mars.R b/tests/testthat/test_mars.R
@@ -285,8 +285,6 @@ test_that('submodel prediction', {
 
 # ------------------------------------------------------------------------------
 
-data("lending_club")
-
 test_that('classification', {
   skip_if_not_installed("earth")
 

diff --git a/tests/testthat/test_rand_forest_randomForest.R b/tests/testthat/test_rand_forest_randomForest.R
@@ -9,7 +9,6 @@ source("helper-objects.R")
 
 # ------------------------------------------------------------------------------
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 num_pred <- c("funded_amnt", "annual_inc", "num_il_tl")
 

diff --git a/tests/testthat/test_rand_forest_ranger.R b/tests/testthat/test_rand_forest_ranger.R
@@ -10,7 +10,6 @@ source("helper-objects.R")
 
 # ------------------------------------------------------------------------------
 
-data("lending_club")
 lending_club <- head(lending_club, 200)
 num_pred <- c("funded_amnt", "annual_inc", "num_il_tl")
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,4 +49,5 @@ Suggests: @@
         ranger,
         rpart,
         MASS,
-        nlme
+        nlme,
+        modeldata