FIX avoid using sequences of sequences and fix tests

jnothman · jnothman · commit 82864ad73b97 · 2014-06-24T16:27:05.000-04:00
diff --git a/sklearn/tests/test_multiclass.py b/sklearn/tests/test_multiclass.py
@@ -63,15 +63,20 @@ def test_ovr_always_present():
     # Note: tests is the case where _ConstantPredictor is utilised
     X = np.ones((10, 2))
     X[:5, :] = 0
-    y = [[int(i >= 5), 2, 3] for i in range(10)]
+    y = np.zeros((10, 3))
+    y[5:, 0] = 1
+    y[:, 1] = 1
+    y[:, 2] = 1
+
+    [[int(i >= 5), 2, 3] for i in range(10)]
     ovr = OneVsRestClassifier(LogisticRegression())
     assert_warns(UserWarning, ovr.fit, X, y)
     y_pred = ovr.predict(X)
     assert_array_equal(np.array(y_pred), np.array(y))
     y_pred = ovr.decision_function(X)
     assert_equal(np.unique(y_pred[:, -2:]), 1)
     y_pred = ovr.predict_proba(X)
-    assert_array_equal(y_pred[:, -2:], np.ones((X.shape[0], 2)))
+    assert_array_equal(y_pred[:, -1], np.ones(X.shape[0]))
 
     # y has a constantly absent label
     y = np.zeros((10, 2))
