Skip to content
Snippets Groups Projects
Commit 7fa40ad5 authored by Fabian Pedregosa's avatar Fabian Pedregosa
Browse files

Remain compatible with numpy 1.2

parent 8a195624
No related branches found
No related tags found
No related merge requests found
import numpy as np import numpy as np
from numpy.testing import assert_, assert_array_almost_equal from numpy.testing import assert_array_almost_equal
from scikits.learn import linear_model, datasets from scikits.learn import linear_model, datasets
...@@ -84,7 +84,7 @@ def test_collinearity(): ...@@ -84,7 +84,7 @@ def test_collinearity():
y = np.array([1., 0., 0]) y = np.array([1., 0., 0])
_, _, coef_path_ = linear_model.lars_path(X, y) _, _, coef_path_ = linear_model.lars_path(X, y)
assert_(not np.isnan(coef_path_).any()) assert (not np.isnan(coef_path_).any())
assert_array_almost_equal(np.dot(X, coef_path_[:,-1]), y) assert_array_almost_equal(np.dot(X, coef_path_[:,-1]), y)
......
import numpy as np import numpy as np
from numpy.testing import assert_array_almost_equal, assert_array_equal, \ from numpy.testing import assert_array_almost_equal, assert_array_equal
assert_
from scikits.learn import neighbors, datasets from scikits.learn import neighbors, datasets
...@@ -58,13 +57,13 @@ def test_neighbors_iris(): ...@@ -58,13 +57,13 @@ def test_neighbors_iris():
assert_array_equal(clf.predict(iris.data), iris.target) assert_array_equal(clf.predict(iris.data), iris.target)
clf.fit(iris.data, iris.target, n_neighbors=9, algorithm=s) clf.fit(iris.data, iris.target, n_neighbors=9, algorithm=s)
assert_(np.mean(clf.predict(iris.data)== iris.target) > 0.95) assert np.mean(clf.predict(iris.data)== iris.target) > 0.95
for m in ('barycenter', 'mean'): for m in ('barycenter', 'mean'):
rgs = neighbors.NeighborsRegressor() rgs = neighbors.NeighborsRegressor()
rgs.fit(iris.data, iris.target, mode=m, algorithm=s) rgs.fit(iris.data, iris.target, mode=m, algorithm=s)
assert_(np.mean( assert np.mean(
rgs.predict(iris.data).round() == iris.target) > 0.95) rgs.predict(iris.data).round() == iris.target) > 0.95
def test_kneighbors_graph(): def test_kneighbors_graph():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment