Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 700492c

Browse filesBrowse files
committed
use assert_allclose
1 parent ba53ef2 commit 700492c
Copy full SHA for 700492c

File tree

1 file changed

+17
-18
lines changed
Filter options

1 file changed

+17
-18
lines changed

‎sklearn/linear_model/tests/test_sgd.py

Copy file name to clipboardExpand all lines: sklearn/linear_model/tests/test_sgd.py
+17-18Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from sklearn.utils._testing import assert_array_equal
99
from sklearn.utils._testing import assert_almost_equal
1010
from sklearn.utils._testing import assert_array_almost_equal
11+
from sklearn.utils._testing import assert_allclose
1112
from sklearn.utils._testing import ignore_warnings
1213
from sklearn.utils.fixes import parse_version
1314

@@ -1457,13 +1458,13 @@ def _test_warm_start_oneclass(klass, X, lr):
14571458
clf3.fit(X)
14581459

14591460
assert clf3.t_ == clf.t_
1460-
assert_array_almost_equal(clf3.coef_, clf.coef_)
1461+
assert_allclose(clf3.coef_, clf.coef_)
14611462

14621463
clf3.set_params(nu=0.1)
14631464
clf3.fit(X)
14641465

14651466
assert clf3.t_ == clf2.t_
1466-
assert_array_almost_equal(clf3.coef_, clf2.coef_)
1467+
assert_allclose(clf3.coef_, clf2.coef_)
14671468

14681469

14691470
@pytest.mark.parametrize('klass', [SGDOneClassSVM, SparseSGDOneClassSVM])
@@ -1527,9 +1528,9 @@ def test_partial_fit_equal_fit_oneclass(klass, lr):
15271528
y_scores2 = clf.decision_function(T)
15281529

15291530
assert clf.t_ == t
1530-
assert_array_almost_equal(y_scores, y_scores2)
1531-
assert_array_almost_equal(clf.coef_, coef)
1532-
assert_array_almost_equal(clf.offset_, offset)
1531+
assert_allclose(y_scores, y_scores2)
1532+
assert_allclose(clf.coef_, coef)
1533+
assert_allclose(clf.offset_, offset)
15331534

15341535

15351536
@pytest.mark.parametrize('klass', [SGDOneClassSVM, SparseSGDOneClassSVM])
@@ -1555,10 +1556,8 @@ def test_late_onset_averaging_reached_oneclass(klass):
15551556
coef_init=clf2.coef_.ravel(),
15561557
offset_init=clf2.offset_)
15571558

1558-
assert_array_almost_equal(clf1.coef_.ravel(),
1559-
average_coef.ravel(),
1560-
decimal=16)
1561-
assert_almost_equal(clf1.offset_, average_offset, decimal=15)
1559+
assert_allclose(clf1.coef_.ravel(), average_coef.ravel())
1560+
assert_allclose(clf1.offset_, average_offset)
15621561

15631562

15641563
@pytest.mark.parametrize('klass', [SGDOneClassSVM, SparseSGDOneClassSVM])
@@ -1579,8 +1578,8 @@ def test_sgd_averaged_computed_correctly_oneclass(klass):
15791578
clf.fit(X)
15801579
average_coef, average_offset = asgd_oneclass(klass, X, eta, nu)
15811580

1582-
assert_array_almost_equal(clf.coef_, average_coef, decimal=16)
1583-
assert_almost_equal(clf.offset_, average_offset, decimal=15)
1581+
assert_allclose(clf.coef_, average_coef)
1582+
assert_allclose(clf.offset_, average_offset)
15841583

15851584

15861585
@pytest.mark.parametrize('klass', [SGDOneClassSVM, SparseSGDOneClassSVM])
@@ -1602,8 +1601,8 @@ def test_sgd_averaged_partial_fit_oneclass(klass):
16021601
clf.partial_fit(X[int(n_samples / 2):][:])
16031602
average_coef, average_offset = asgd_oneclass(klass, X, eta, nu)
16041603

1605-
assert_array_almost_equal(clf.coef_, average_coef, decimal=16)
1606-
assert_almost_equal(clf.offset_, average_offset, decimal=15)
1604+
assert_allclose(clf.coef_, average_coef)
1605+
assert_allclose(clf.offset_, average_offset)
16071606

16081607

16091608
@pytest.mark.parametrize('klass', [SGDOneClassSVM, SparseSGDOneClassSVM])
@@ -1622,8 +1621,8 @@ def test_average_sparse_oneclass(klass):
16221621
clf.partial_fit(X3[int(n_samples / 2):])
16231622
average_coef, average_offset = asgd_oneclass(klass, X3, eta, nu)
16241623

1625-
assert_array_almost_equal(clf.coef_, average_coef, decimal=16)
1626-
assert_almost_equal(clf.offset_, average_offset, decimal=15)
1624+
assert_allclose(clf.coef_, average_coef)
1625+
assert_allclose(clf.offset_, average_offset)
16271626

16281627

16291628
def test_sgd_oneclass():
@@ -1634,14 +1633,14 @@ def test_sgd_oneclass():
16341633
clf = SGDOneClassSVM(nu=0.5, eta0=1, learning_rate='constant',
16351634
shuffle=False, max_iter=1)
16361635
clf.fit(X_train)
1637-
assert_array_almost_equal(clf.coef_, np.array([-0.125, 0.4375]))
1636+
assert_allclose(clf.coef_, np.array([-0.125, 0.4375]))
16381637
assert clf.offset_[0] == -0.5
16391638

16401639
scores = clf.score_samples(X_test)
1641-
assert_array_almost_equal(scores, np.array([-0.9375, 0.625]))
1640+
assert_allclose(scores, np.array([-0.9375, 0.625]))
16421641

16431642
dec = clf.score_samples(X_test) - clf.offset_
1644-
assert_array_almost_equal(clf.decision_function(X_test), dec)
1643+
assert_allclose(clf.decision_function(X_test), dec)
16451644

16461645
pred = clf.predict(X_test)
16471646
assert_array_equal(pred, np.array([-1, 1]))

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.