Friendly error on KNeighbors(n_neighbors<=0 )

xuewei4d · xuewei4d · commit bb4704edf47f · 2015-03-04T14:11:26.000-05:00
diff --git a/sklearn/neighbors/base.py b/sklearn/neighbors/base.py
@@ -260,12 +260,7 @@ def _fit(self, X):
                              % self.algorithm)
 
         if self.n_neighbors is not None:
-            try:
-                self.n_neighbors = int(self.n_neighbors)
-            except ValueError:
-                raise ValueError("n_neighbors is not convertible to int")
-
-            if self.n_neighbors < 1:
+            if self.n_neighbors <= 0:
                 raise ValueError(
                     "Expected n_neighbors > 0. Got %d" %
                     self.n_neighbors
diff --git a/sklearn/neighbors/tests/test_neighbors.py b/sklearn/neighbors/tests/test_neighbors.py
@@ -815,12 +815,10 @@ def test_neighbors_badargs():
         assert_raises(ValueError,
                       nbrs.predict,
                       [])
-        nbrs = cls(n_neighbors='blah')
-        assert_raises(ValueError,
-                      nbrs.fit,
-                      X, y)
-        nbrs = cls(n_neighbors=-1)
-        assert_raises(ValueError,
+        if isinstance(cls, neighbors.KNeighborsClassifier) or \
+                isinstance(cls, neighbors.KNeighborsRegressor):
+            nbrs = cls(n_neighbors=-1)
+            assert_raises(ValueError,
                       nbrs.fit,
                       X, y)
 
