Merge pull request #162 from martinju/fix_new_shapr_PR

Fix for new shapr package structure

R/shapviz.R

@@ -410,10 +410,10 @@ shapviz.predict_parts <- function(object, ...) {
 #' @describeIn shapviz
 #'   Creates a "shapviz" object from `shapr::explain()`.
 #' @export
-shapviz.shapr <- function(object, X = object[["x_test"]], collapse = NULL, ...) {
-  dt <- as.matrix(object[["dt"]])
+shapviz.shapr <- function(object, X = as.data.frame(object$internal$data$x_explain), collapse = NULL, ...) {
+  dt <- as.matrix(object[["shapley_values_est"]])
   shapviz.matrix(
-    object = dt[, setdiff(colnames(dt), "none"), drop = FALSE],
+    object = dt[, setdiff(colnames(dt), c("none","explain_id")), drop = FALSE],
     X = X,
     baseline = dt[1L, "none"],
     collapse = collapse

vignettes/basic_use.Rmd

@@ -163,10 +163,14 @@ library(shapviz)
 library(shapr)
 
 fit <- lm(Sepal.Length ~ ., data = iris)
-x <- shapr(iris, fit)
 explanation <- shapr::explain(
-  iris, approach = "ctree", explainer = x, prediction_zero = mean(iris$Sepal.Length)
+  model = fit,
+  x_train = iris[-1],
+  x_explain = iris[-1],
+  approach = "ctree",
+  phi0 = mean(iris$Sepal.Length)
 )
+
 shp <- shapviz(explanation)
 sv_importance(shp)
 sv_dependence(shp, "Sepal.Width")