Merge pull request #5542 from arjoly/tree-no-sparse-y

amueller · amueller · commit 91753dc0f50d · 2015-10-23T16:57:21.000+02:00
[MRG+1] Raise appropriate error if y is sparse
diff --git a/sklearn/tree/tests/test_tree.py b/sklearn/tree/tests/test_tree.py
@@ -1376,3 +1376,15 @@ def check_decision_path(name):
 def test_decision_path():
     for name in ALL_TREES:
         yield (check_decision_path, name)
+
+
+def check_no_sparse_y_support(name):
+    X, y = X_multilabel, csr_matrix(y_multilabel)
+    TreeEstimator = ALL_TREES[name]
+    assert_raises(ValueError, TreeEstimator(random_state=0).fit, X, y)
+
+
+def test_no_sparse_y_support():
+    # Currently we don't support sparse y
+    for name in ALL_TREES:
+        yield (check_decision_path, name)
diff --git a/sklearn/tree/tree.py b/sklearn/tree/tree.py
@@ -151,7 +151,7 @@ def fit(self, X, y, sample_weight=None, check_input=True,
         random_state = check_random_state(self.random_state)
         if check_input:
             X = check_array(X, dtype=DTYPE, accept_sparse="csc")
-            y = check_array(y, accept_sparse='csc', ensure_2d=False, dtype=None)
+            y = check_array(y, ensure_2d=False, dtype=None)
             if issparse(X):
                 X.sort_indices()
 
