8
8
from sklearn .utils ._testing import assert_array_equal
9
9
from sklearn .utils ._testing import assert_almost_equal
10
10
from sklearn .utils ._testing import assert_array_almost_equal
11
+ from sklearn .utils ._testing import assert_allclose
11
12
from sklearn .utils ._testing import ignore_warnings
12
13
from sklearn .utils .fixes import parse_version
13
14
@@ -1457,13 +1458,13 @@ def _test_warm_start_oneclass(klass, X, lr):
1457
1458
clf3 .fit (X )
1458
1459
1459
1460
assert clf3 .t_ == clf .t_
1460
- assert_array_almost_equal (clf3 .coef_ , clf .coef_ )
1461
+ assert_allclose (clf3 .coef_ , clf .coef_ )
1461
1462
1462
1463
clf3 .set_params (nu = 0.1 )
1463
1464
clf3 .fit (X )
1464
1465
1465
1466
assert clf3 .t_ == clf2 .t_
1466
- assert_array_almost_equal (clf3 .coef_ , clf2 .coef_ )
1467
+ assert_allclose (clf3 .coef_ , clf2 .coef_ )
1467
1468
1468
1469
1469
1470
@pytest .mark .parametrize ('klass' , [SGDOneClassSVM , SparseSGDOneClassSVM ])
@@ -1527,9 +1528,9 @@ def test_partial_fit_equal_fit_oneclass(klass, lr):
1527
1528
y_scores2 = clf .decision_function (T )
1528
1529
1529
1530
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 )
1533
1534
1534
1535
1535
1536
@pytest .mark .parametrize ('klass' , [SGDOneClassSVM , SparseSGDOneClassSVM ])
@@ -1555,10 +1556,8 @@ def test_late_onset_averaging_reached_oneclass(klass):
1555
1556
coef_init = clf2 .coef_ .ravel (),
1556
1557
offset_init = clf2 .offset_ )
1557
1558
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 )
1562
1561
1563
1562
1564
1563
@pytest .mark .parametrize ('klass' , [SGDOneClassSVM , SparseSGDOneClassSVM ])
@@ -1579,8 +1578,8 @@ def test_sgd_averaged_computed_correctly_oneclass(klass):
1579
1578
clf .fit (X )
1580
1579
average_coef , average_offset = asgd_oneclass (klass , X , eta , nu )
1581
1580
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 )
1584
1583
1585
1584
1586
1585
@pytest .mark .parametrize ('klass' , [SGDOneClassSVM , SparseSGDOneClassSVM ])
@@ -1602,8 +1601,8 @@ def test_sgd_averaged_partial_fit_oneclass(klass):
1602
1601
clf .partial_fit (X [int (n_samples / 2 ):][:])
1603
1602
average_coef , average_offset = asgd_oneclass (klass , X , eta , nu )
1604
1603
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 )
1607
1606
1608
1607
1609
1608
@pytest .mark .parametrize ('klass' , [SGDOneClassSVM , SparseSGDOneClassSVM ])
@@ -1622,8 +1621,8 @@ def test_average_sparse_oneclass(klass):
1622
1621
clf .partial_fit (X3 [int (n_samples / 2 ):])
1623
1622
average_coef , average_offset = asgd_oneclass (klass , X3 , eta , nu )
1624
1623
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 )
1627
1626
1628
1627
1629
1628
def test_sgd_oneclass ():
@@ -1634,14 +1633,14 @@ def test_sgd_oneclass():
1634
1633
clf = SGDOneClassSVM (nu = 0.5 , eta0 = 1 , learning_rate = 'constant' ,
1635
1634
shuffle = False , max_iter = 1 )
1636
1635
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 ]))
1638
1637
assert clf .offset_ [0 ] == - 0.5
1639
1638
1640
1639
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 ]))
1642
1641
1643
1642
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 )
1645
1644
1646
1645
pred = clf .predict (X_test )
1647
1646
assert_array_equal (pred , np .array ([- 1 , 1 ]))
0 commit comments