Merge pull request #202 from tidymodels/xgboost-fix

Author: EmilHvitfeldt

NEWS.md

@@ -1,5 +1,7 @@
 # lime (development version)
 
+* Make package work with all versions of xgboost. (#202)
+
 # lime 0.5.3
 
 * Emil Hvitfelt is taking over maintenance

R/models.R

@@ -155,10 +155,11 @@ predict_model.xgb.Booster <- function(x, newdata, type, ...) {
   if (is.data.frame(newdata)) {
     newdata <- xgboost::xgb.DMatrix(as.matrix(newdata))
   }
-  p <- data.frame(
-    predict(x, newdata = newdata, reshape = TRUE, ...),
-    stringsAsFactors = FALSE
-  )
+  if (is.null(x$params)) {
+    p <- data.frame(predict(x, newdata = newdata, ...))
+  } else {
+    p <- data.frame(predict(x, newdata = newdata, reshape = TRUE, ...))
+  }
   if (type == 'raw') {
     names(p) <- 'Response'
   } else if (type == 'prob') {
@@ -277,7 +278,7 @@ model_type.WrappedModel <- function(x, ...) {
 }
 #' @export
 model_type.xgb.Booster <- function(x, ...) {
-  obj <- x$params$objective
+  obj <- x$params$objective %||% attr(x, "params")$objective
   if (is.null(obj)) {
     return('regression')
   }

tests/testthat/test-text.R

@@ -28,9 +28,7 @@ xgb_model <- xgb.train(
   nrounds = 50
 )
 
-
 test_that("single sentence explanation", {
-  skip("xgboost: will fix soon")
   to_explain <- "Since our motivation is an application in bioinformatics, our notation and terminology will be drawn from that area"
   expect_gt(predict(xgb_model, get_matrix(to_explain)), 0.5)
   explainer <- lime(x = to_explain, model = xgb_model, preprocess = get_matrix)