Fix for 0.17.X CPed from master (#6401)

yarikoptic · amueller · commit 9e3ebd43e76b · 2016-10-07T20:21:12.000-04:00
* fix floating point indexing in generic univariate

* weird work-around for spearman test

* add test for auto increasing
diff --git a/sklearn/feature_selection/univariate_selection.py b/sklearn/feature_selection/univariate_selection.py
@@ -403,7 +403,7 @@ def _get_support_mask(self):
         mask = scores > treshold
         ties = np.where(scores == treshold)[0]
         if len(ties):
-            max_feats = len(scores) * self.percentile // 100
+            max_feats = int(len(scores) * self.percentile / 100)
             kept_ties = ties[:max_feats - mask.sum()]
             mask[kept_ties] = True
         return mask
diff --git a/sklearn/tests/test_isotonic.py b/sklearn/tests/test_isotonic.py
@@ -1,3 +1,4 @@
+import warnings
 import numpy as np
 import pickle
 
@@ -166,7 +167,12 @@ def test_isotonic_regression_auto_decreasing():
 
     # Create model and fit_transform
     ir = IsotonicRegression(increasing='auto')
-    y_ = assert_no_warnings(ir.fit_transform, x, y)
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        y_ = ir.fit_transform(x, y)
+        # work-around for pearson divide warnings in scipy <= 0.17.0
+        assert_true(all(["invalid value encountered in "
+                         in str(warn.message) for warn in w]))
 
     # Check that relationship decreases
     is_increasing = y_[0] < y_[-1]
@@ -180,7 +186,12 @@ def test_isotonic_regression_auto_increasing():
 
     # Create model and fit_transform
     ir = IsotonicRegression(increasing='auto')
-    y_ = assert_no_warnings(ir.fit_transform, x, y)
+    with warnings.catch_warnings(record=True) as w:
+        warnings.simplefilter("always")
+        y_ = ir.fit_transform(x, y)
+        # work-around for pearson divide warnings in scipy <= 0.17.0
+        assert_true(all(["invalid value encountered in "
+                         in str(warn.message) for warn in w]))
 
     # Check that relationship increases
     is_increasing = y_[0] < y_[-1]
