split data using _safe_split in _permutaion_test_scorer to fix error when using Pandas DataFrame/Series

Stijn Tonk · Stijn Tonk · commit 3cf5e8fb99c5 · 2016-12-28T17:20:40.000+01:00
diff --git a/sklearn/cross_validation.py b/sklearn/cross_validation.py
@@ -1756,8 +1756,10 @@ def _permutation_test_score(estimator, X, y, cv, scorer):
     """Auxiliary function for permutation_test_score"""
     avg_score = []
     for train, test in cv:
-        estimator.fit(X[train], y[train])
-        avg_score.append(scorer(estimator, X[test], y[test]))
+        X_train, y_train = _safe_split(estimator, X, y, train)
+        X_test, y_test  = _safe_split(estimator, X, y, test, train)
+        estimator.fit(X_train, y_train)
+        avg_score.append(scorer(estimator, X_test, y_test))
     return np.mean(avg_score)
 
 
