From b9a044142d4264957f295bb1b92a0a606cdbc42a Mon Sep 17 00:00:00 2001 From: Anand Jeyahar Date: Wed, 28 Sep 2016 17:17:09 +0530 Subject: [PATCH 1/3] fixing issue #7474 --- sklearn/feature_selection/univariate_selection.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sklearn/feature_selection/univariate_selection.py b/sklearn/feature_selection/univariate_selection.py index 16002101a37f8..81ccf437a0147 100644 --- a/sklearn/feature_selection/univariate_selection.py +++ b/sklearn/feature_selection/univariate_selection.py @@ -596,8 +596,7 @@ def _get_support_mask(self): n_features = len(self.pvalues_) sv = np.sort(self.pvalues_) - selected = sv[sv <= float(self.alpha) / n_features - * np.arange(n_features)] + selected = sv[sv <= float(self.alpha) / n_features * (np.arange(n_features) + 1)] if selected.size == 0: return np.zeros_like(self.pvalues_, dtype=bool) return self.pvalues_ <= selected.max() From 262533b0acabeddf6a480e8be6272a1792500bd4 Mon Sep 17 00:00:00 2001 From: Anand Jeyahar Date: Wed, 28 Sep 2016 17:53:26 +0530 Subject: [PATCH 2/3] pep8 consistent formatting.. need to check if test case test_select_fdr_regression needs change. Seems to fail randomly --- sklearn/feature_selection/univariate_selection.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sklearn/feature_selection/univariate_selection.py b/sklearn/feature_selection/univariate_selection.py index 81ccf437a0147..720d04dfbbe48 100644 --- a/sklearn/feature_selection/univariate_selection.py +++ b/sklearn/feature_selection/univariate_selection.py @@ -596,7 +596,9 @@ def _get_support_mask(self): n_features = len(self.pvalues_) sv = np.sort(self.pvalues_) - selected = sv[sv <= float(self.alpha) / n_features * (np.arange(n_features) + 1)] + selected = sv[sv <= float(self.alpha) / n_features + * (np.arange(n_features) + 1)] + print(selected) if selected.size == 0: return np.zeros_like(self.pvalues_, dtype=bool) return self.pvalues_ <= selected.max() From 197272175250b92a20b76be3a6b06d0353f53410 Mon Sep 17 00:00:00 2001 From: Anand Jeyahar Date: Wed, 28 Sep 2016 19:00:20 +0530 Subject: [PATCH 3/3] removing print --- sklearn/feature_selection/univariate_selection.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sklearn/feature_selection/univariate_selection.py b/sklearn/feature_selection/univariate_selection.py index 720d04dfbbe48..34b82c4061eb9 100644 --- a/sklearn/feature_selection/univariate_selection.py +++ b/sklearn/feature_selection/univariate_selection.py @@ -598,7 +598,6 @@ def _get_support_mask(self): sv = np.sort(self.pvalues_) selected = sv[sv <= float(self.alpha) / n_features * (np.arange(n_features) + 1)] - print(selected) if selected.size == 0: return np.zeros_like(self.pvalues_, dtype=bool) return self.pvalues_ <= selected.max()