Merge pull request #5852 from nickyj88/master

TomDLT · TomDLT · commit 2f7631036850 · 2015-12-12T15:54:33.000+01:00
[MRG + 1] remove string to array comparison in RandomizedLasso
diff --git a/sklearn/linear_model/randomized_l1.py b/sklearn/linear_model/randomized_l1.py
@@ -330,7 +330,7 @@ def __init__(self, alpha='aic', scaling=.5, sample_fraction=.75,
     def _make_estimator_and_params(self, X, y):
         assert self.precompute in (True, False, None, 'auto')
         alpha = self.alpha
-        if alpha in ('aic', 'bic'):
+        if isinstance(alpha, six.string_types) and alpha in ('aic', 'bic'):
             model = LassoLarsIC(precompute=self.precompute,
                                 criterion=self.alpha,
                                 max_iter=self.max_iter,
