Merge branch 'master' of https://github.com/ModelOriented/ingredients

* 'master' of https://github.com/ModelOriented/ingredients: potential fix for #137
ModelOriented · Apr 7, 2021 · 019af85 · 019af85
2 parents 367e18e + d0b5264
commit 019af85
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+ingredients 2.2.0
+--------------------------------------------------------------
+* fixes explanations when data has one column [#137](https://github.com/ModelOriented/ingredients/issues/137)
+
 ingredients 2.0.1
 --------------------------------------------------------------
 * code and documentation maintenance [#130](https://github.com/ModelOriented/ingredients/issues/130)

diff --git a/R/accumulated_dependence.R b/R/accumulated_dependence.R
@@ -109,7 +109,7 @@ accumulated_dependence.default <- function(x,
                                            variable_type = "numerical") {
   if (!is.null(N) && N < nrow(data)) {
     # sample N points
-    ndata <- data[sample(1:nrow(data), N),]
+    ndata <- data[sample(1:nrow(data), N), , drop = FALSE]
   } else {
     ndata <- data
   }

diff --git a/R/conditional_dependence.R b/R/conditional_dependence.R
@@ -107,7 +107,7 @@ conditional_dependence.default <- function(x,
 
   if (!is.null(N) && N < nrow(data)) {
     # sample N points
-    ndata <- data[sample(1:nrow(data), N),]
+    ndata <- data[sample(1:nrow(data), N), , drop = FALSE]
   } else {
     ndata <- data
   }

diff --git a/R/feature_importance.R b/R/feature_importance.R
@@ -212,7 +212,7 @@ feature_importance.default <- function(x,
         sampled_rows <- sample(1:nrow(data), N)
       }
     }
-    sampled_data <- data[sampled_rows, ]
+    sampled_data <- data[sampled_rows, , drop = FALSE]
     observed <- y[sampled_rows]
     # loss on the full model or when outcomes are permuted
     loss_full <- loss_function(observed, predict_function(x, sampled_data))

diff --git a/R/partial_dependence.R b/R/partial_dependence.R
@@ -107,7 +107,7 @@ partial_dependence.default <- function(x,
                                        variable_type = "numerical") {
   if (!is.null(N) && N < nrow(data)) {
     # sample N points
-    ndata <- data[sample(1:nrow(data), N),]
+    ndata <- data[sample(1:nrow(data), N), , drop = FALSE]
   } else {
     ndata <- data
   }