fix #354

imbs-hl · Sep 26, 2018 · 88356ed · 88356ed
1 parent 9490a26
commit 88356ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/R/ranger.R b/R/ranger.R
@@ -284,7 +284,7 @@ ranger <- function(formula = NULL, data = NULL, num.trees = 500, mtry = NULL,
     } else {
       treetype <- 1
     }
-  } else if (is.numeric(response) && is.vector(response)) {
+  } else if (is.numeric(response) && (is.null(ncol(response)) || ncol(response) == 1)) {
     if (!is.null(classification) && classification && !probability) {
       treetype <- 1
     } else if (probability) {

diff --git a/tests/testthat/test_interface.R b/tests/testthat/test_interface.R
@@ -57,6 +57,18 @@ test_that("Error if interaction of factor variable included", {
                "Error: Only numeric columns allowed in interaction terms.")
 })
 
+test_that("Working if dependent variable has attributes other than names", {
+  iris2 <- iris
+  attr(iris2$Sepal.Width, "aaa") <- "bbb"
+  expect_silent(ranger(data = iris2, dependent.variable = "Sepal.Width"))
+})
+
+test_that("Working if dependent variable is matrix with one column", {
+  iris2 <- iris
+  iris2$Sepal.Width = scale(iris$Sepal.Width)
+  expect_silent(ranger(data = iris2, dependent.variable = "Sepal.Width"))
+})
+
 # Tibbles
 # This is failing on Rdevel. Possible without suggesting tibble package?
 # if (requireNamespace("tibble", quietly = TRUE)) {