diff --git a/tods/sk_interface/script/detection_algorithm_skitest_generation.py b/tods/sk_interface/script/detection_algorithm_skitest_generation.py index aecd71f..913285c 100644 --- a/tods/sk_interface/script/detection_algorithm_skitest_generation.py +++ b/tods/sk_interface/script/detection_algorithm_skitest_generation.py @@ -36,19 +36,22 @@ import os import_line2 = """from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score\n """ main_line1 = 'class ' + algorithm_name + 'SKI_TestCase(unittest.TestCase):\n' + \ """ def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -62,12 +65,12 @@ from sklearn.metrics import roc_auc_score\n main_line2 = ' self.transformer = ' + class_name + '(contamination=self.contamination)\n self.transformer.fit(self.X_train)\n\n' main_line3 = """ def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/script/feature_analysis_skitest_generation.py b/tods/sk_interface/script/feature_analysis_skitest_generation.py index fe1f36d..48d5262 100644 --- a/tods/sk_interface/script/feature_analysis_skitest_generation.py +++ b/tods/sk_interface/script/feature_analysis_skitest_generation.py @@ -37,13 +37,6 @@ import os import_line2 = """from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score\n """ diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_ABOD.py b/tods/sk_interface/test/detection_algorithm/test_ski_ABOD.py index 642653c..f83c6f4 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_ABOD.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_ABOD.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.ABOD_skinterface import ABODSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class ABODSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class ABODSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_AutoEncoder.py b/tods/sk_interface/test/detection_algorithm/test_ski_AutoEncoder.py index 73fff44..3cd790f 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_AutoEncoder.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_AutoEncoder.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.AutoEncoder_skinterface import AutoEn from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class AutoEncoderSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class AutoEncoderSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_AutoRegODetector.py b/tods/sk_interface/test/detection_algorithm/test_ski_AutoRegODetector.py index ea0195a..e57f2c6 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_AutoRegODetector.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_AutoRegODetector.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.AutoRegODetector_skinterface import A from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class AutoRegODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class AutoRegODetectorSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_CBLOF.py b/tods/sk_interface/test/detection_algorithm/test_ski_CBLOF.py index a4b9f1b..d6f7dc3 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_CBLOF.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_CBLOF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.CBLOF_skinterface import CBLOFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class CBLOFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class CBLOFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_COF.py b/tods/sk_interface/test/detection_algorithm/test_ski_COF.py index b6e2bc3..db04376 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_COF.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_COF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.COF_skinterface import COFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class COFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class COFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_DeepLog.py b/tods/sk_interface/test/detection_algorithm/test_ski_DeepLog.py index 7d62970..cd4caa5 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_DeepLog.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_DeepLog.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.DeepLog_skinterface import DeepLogSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class DeepLogSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class DeepLogSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_HBOS.py b/tods/sk_interface/test/detection_algorithm/test_ski_HBOS.py index ad12510..fe90959 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_HBOS.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_HBOS.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.HBOS_skinterface import HBOSSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class HBOSSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class HBOSSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_IsolationForest.py b/tods/sk_interface/test/detection_algorithm/test_ski_IsolationForest.py index aac8db1..0ef1c99 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_IsolationForest.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_IsolationForest.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.IsolationForest_skinterface import Is from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class IsolationForestSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class IsolationForestSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_KDiscordODetector.py b/tods/sk_interface/test/detection_algorithm/test_ski_KDiscordODetector.py index 0c945da..648547a 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_KDiscordODetector.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_KDiscordODetector.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.KDiscordODetector_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class KDiscordODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class KDiscordODetectorSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_KNN.py b/tods/sk_interface/test/detection_algorithm/test_ski_KNN.py index 473a95d..a178214 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_KNN.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_KNN.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.KNN_skinterface import KNNSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class KNNSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class KNNSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_LODA.py b/tods/sk_interface/test/detection_algorithm/test_ski_LODA.py index 857f0c4..933d96e 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_LODA.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_LODA.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LODA_skinterface import LODASKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LODASKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class LODASKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_LOF.py b/tods/sk_interface/test/detection_algorithm/test_ski_LOF.py index f0114b3..6905696 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_LOF.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_LOF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LOF_skinterface import LOFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LOFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class LOFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_LSTMODetector.py b/tods/sk_interface/test/detection_algorithm/test_ski_LSTMODetector.py index 25ec603..7c84164 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_LSTMODetector.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_LSTMODetector.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LSTMODetector_skinterface import LSTM from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LSTMODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class LSTMODetectorSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_MatrixProfile.py b/tods/sk_interface/test/detection_algorithm/test_ski_MatrixProfile.py index 6ab3734..969d714 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_MatrixProfile.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_MatrixProfile.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.MatrixProfile_skinterface import Matr from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class MatrixProfileSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class MatrixProfileSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_Mo_Gaal.py b/tods/sk_interface/test/detection_algorithm/test_ski_Mo_Gaal.py index a6cc75f..78d1181 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_Mo_Gaal.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_Mo_Gaal.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.Mo_Gaal_skinterface import Mo_GaalSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class Mo_GaalSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class Mo_GaalSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_OCSVM.py b/tods/sk_interface/test/detection_algorithm/test_ski_OCSVM.py index ae6142d..04f253a 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_OCSVM.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_OCSVM.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.OCSVM_skinterface import OCSVMSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class OCSVMSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class OCSVMSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_PCAODetector.py b/tods/sk_interface/test/detection_algorithm/test_ski_PCAODetector.py index 6a1127d..dc2de2a 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_PCAODetector.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_PCAODetector.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.PCAODetector_skinterface import PCAOD from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class PCAODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class PCAODetectorSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_SOD.py b/tods/sk_interface/test/detection_algorithm/test_ski_SOD.py index 439cb22..229fac2 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_SOD.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_SOD.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.SOD_skinterface import SODSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class SODSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class SODSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_So_Gaal.py b/tods/sk_interface/test/detection_algorithm/test_ski_So_Gaal.py index 36abfac..795f4f9 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_So_Gaal.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_So_Gaal.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.So_Gaal_skinterface import So_GaalSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class So_GaalSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class So_GaalSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_SystemWiseDetection.py b/tods/sk_interface/test/detection_algorithm/test_ski_SystemWiseDetection.py index fc9c23a..8c58b67 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_SystemWiseDetection.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_SystemWiseDetection.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.SystemWiseDetection_skinterface impor from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class SystemWiseDetectionSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class SystemWiseDetectionSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_Telemanom.py b/tods/sk_interface/test/detection_algorithm/test_ski_Telemanom.py index a69db94..4031edd 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_Telemanom.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_Telemanom.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.Telemanom_skinterface import Telemano from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class TelemanomSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class TelemanomSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/detection_algorithm/test_ski_VariationalAutoEncoder.py b/tods/sk_interface/test/detection_algorithm/test_ski_VariationalAutoEncoder.py index 6f95c42..ab9b7af 100644 --- a/tods/sk_interface/test/detection_algorithm/test_ski_VariationalAutoEncoder.py +++ b/tods/sk_interface/test/detection_algorithm/test_ski_VariationalAutoEncoder.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.VariationalAutoEncoder_skinterface im from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class VariationalAutoEncoderSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class VariationalAutoEncoderSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/sk_interface/test/feature_analysis/test_ski_AutoCorrelation.py b/tods/sk_interface/test/feature_analysis/test_ski_AutoCorrelation.py index 6dc3988..dc14887 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_AutoCorrelation.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_AutoCorrelation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.AutoCorrelation_skinterface import AutoC from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class AutoCorrelationSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_BKFilter.py b/tods/sk_interface/test/feature_analysis/test_ski_BKFilter.py index 0012aa4..538cd52 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_BKFilter.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_BKFilter.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.BKFilter_skinterface import BKFilterSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class BKFilterSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_DiscreteCosineTransform.py b/tods/sk_interface/test/feature_analysis/test_ski_DiscreteCosineTransform.py index a3bf8b7..5f13a82 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_DiscreteCosineTransform.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_DiscreteCosineTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.DiscreteCosineTransform_skinterface impo from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class DiscreteCosineTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_FastFourierTransform.py b/tods/sk_interface/test/feature_analysis/test_ski_FastFourierTransform.py index 4bd5b79..4a0c0a9 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_FastFourierTransform.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_FastFourierTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.FastFourierTransform_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class FastFourierTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_HPFilter.py b/tods/sk_interface/test/feature_analysis/test_ski_HPFilter.py index 484a6cb..fb53454 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_HPFilter.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_HPFilter.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.HPFilter_skinterface import HPFilterSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class HPFilterSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_NonNegativeMatrixFactorization.py b/tods/sk_interface/test/feature_analysis/test_ski_NonNegativeMatrixFactorization.py index 994d1bd..1af73c8 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_NonNegativeMatrixFactorization.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_NonNegativeMatrixFactorization.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.NonNegativeMatrixFactorization_skinterfa from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class NonNegativeMatrixFactorizationSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_SKTruncatedSVD.py b/tods/sk_interface/test/feature_analysis/test_ski_SKTruncatedSVD.py index 022ec4d..abe0dd5 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_SKTruncatedSVD.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_SKTruncatedSVD.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.SKTruncatedSVD_skinterface import SKTrun from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class SKTruncatedSVDSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_SpectralResidualTransform.py b/tods/sk_interface/test/feature_analysis/test_ski_SpectralResidualTransform.py index 9555cf1..446f245 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_SpectralResidualTransform.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_SpectralResidualTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.SpectralResidualTransform_skinterface im from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class SpectralResidualTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsEnergy.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsEnergy.py index 1937eb2..321cdb4 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsEnergy.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsEnergy.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalAbsEnergy_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalAbsEnergySKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsSum.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsSum.py index 53eb16d..b92c104 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsSum.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalAbsSum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalAbsSum_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalAbsSumSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalGmean.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalGmean.py index 2b98074..ec5588a 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalGmean.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalGmean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalGmean_skinterface import Stat from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalGmeanSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalHmean.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalHmean.py index e177bdb..6d7a57b 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalHmean.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalHmean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalHmean_skinterface import Stat from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalHmeanSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalKurtosis.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalKurtosis.py index f66ffba..fff0920 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalKurtosis.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalKurtosis.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalKurtosis_skinterface import S from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalKurtosisSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMaximum.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMaximum.py index 758ade9..95d9547 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMaximum.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMaximum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMaximum_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMaximumSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMean.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMean.py index 1eb6ad9..e6eacf0 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMean.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMean_skinterface import Stati from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbs.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbs.py index dda8d8d..9f5530b 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbs.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbs.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanAbs_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanAbsSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py index ae44653..03e17e9 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanAbsTemporalDerivative_ski from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanAbsTemporalDerivativeSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py index c2e3677..908ffb0 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanTemporalDerivative_skinte from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanTemporalDerivativeSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedian.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedian.py index f35d242..140d017 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedian.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedian.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMedian_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMedianSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py index 86e1d23..fdd7559 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMedianAbsoluteDeviation_skint from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMedianAbsoluteDeviationSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMinimum.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMinimum.py index 0ca8b48..f42495e 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMinimum.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalMinimum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMinimum_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMinimumSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalSkew.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalSkew.py index 30f7761..d3076c8 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalSkew.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalSkew.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalSkew_skinterface import Stati from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalSkewSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalStd.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalStd.py index a1da0a0..51aecf9 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalStd.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalStd.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalStd_skinterface import Statis from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalStdSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVar.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVar.py index 1cce000..1bd775a 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVar.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVar.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVar_skinterface import Statis from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVarSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVariation.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVariation.py index d72b393..ad92407 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVariation.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVariation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVariation_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVariationSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVecSum.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVecSum.py index 4cf7dc2..bc218de 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVecSum.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalVecSum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVecSum_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVecSumSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalWillisonAmplitude.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalWillisonAmplitude.py index 8f27ff2..332f688 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalWillisonAmplitude.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalWillisonAmplitude.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalWillisonAmplitude_skinterface from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalWillisonAmplitudeSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalZeroCrossing.py b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalZeroCrossing.py index c0962fa..118998c 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_StatisticalZeroCrossing.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_StatisticalZeroCrossing.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalZeroCrossing_skinterface impo from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalZeroCrossingSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_TRMF.py b/tods/sk_interface/test/feature_analysis/test_ski_TRMF.py index 983385a..6bf9f10 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_TRMF.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_TRMF.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.TRMF_skinterface import TRMFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class TRMFSKI_TestCase(unittest.TestCase): diff --git a/tods/sk_interface/test/feature_analysis/test_ski_WaveletTransform.py b/tods/sk_interface/test/feature_analysis/test_ski_WaveletTransform.py index e96cd4e..398592e 100644 --- a/tods/sk_interface/test/feature_analysis/test_ski_WaveletTransform.py +++ b/tods/sk_interface/test/feature_analysis/test_ski_WaveletTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.WaveletTransform_skinterface import Wave from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class WaveletTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/detection_algorithm/__init__.py b/tods/tests/sk_interface/detection_algorithm/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_ABOD.py b/tods/tests/sk_interface/detection_algorithm/test_ski_ABOD.py index 642653c..f83c6f4 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_ABOD.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_ABOD.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.ABOD_skinterface import ABODSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class ABODSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class ABODSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_AutoEncoder.py b/tods/tests/sk_interface/detection_algorithm/test_ski_AutoEncoder.py index 838bd25..3cd790f 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_AutoEncoder.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_AutoEncoder.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.AutoEncoder_skinterface import AutoEn from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class AutoEncoderSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -25,18 +28,18 @@ class AutoEncoderSKI_TestCase(unittest.TestCase): self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - input_dim = self.X_train.shape[1] - self.transformer = AutoEncoderSKI(contamination=self.contamination, hidden_neurons=[input_dim,32,16,32, input_dim]) + + self.transformer = AutoEncoderSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_AutoRegODetector.py b/tods/tests/sk_interface/detection_algorithm/test_ski_AutoRegODetector.py index 78b6bad..e57f2c6 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_AutoRegODetector.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_AutoRegODetector.py @@ -5,40 +5,42 @@ from tods.sk_interface.detection_algorithm.AutoRegODetector_skinterface import A from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class AutoRegODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 self.contamination = 0.1 self.roc_floor = 0.0 - self.window_size = 5 self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - self.y_train = self.y_train[self.window_size:] - self.transformer = AutoRegODetectorSKI(contamination=self.contamination, window_size=self.window_size) + self.transformer = AutoRegODetectorSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + if __name__ == '__main__': unittest.main() diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_CBLOF.py b/tods/tests/sk_interface/detection_algorithm/test_ski_CBLOF.py index a4b9f1b..d6f7dc3 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_CBLOF.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_CBLOF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.CBLOF_skinterface import CBLOFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class CBLOFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class CBLOFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_COF.py b/tods/tests/sk_interface/detection_algorithm/test_ski_COF.py index b6e2bc3..db04376 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_COF.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_COF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.COF_skinterface import COFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class COFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class COFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_DeepLog.py b/tods/tests/sk_interface/detection_algorithm/test_ski_DeepLog.py index 7d62970..cd4caa5 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_DeepLog.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_DeepLog.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.DeepLog_skinterface import DeepLogSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class DeepLogSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class DeepLogSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_HBOS.py b/tods/tests/sk_interface/detection_algorithm/test_ski_HBOS.py index ad12510..fe90959 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_HBOS.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_HBOS.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.HBOS_skinterface import HBOSSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class HBOSSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class HBOSSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_IsolationForest.py b/tods/tests/sk_interface/detection_algorithm/test_ski_IsolationForest.py index aac8db1..0ef1c99 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_IsolationForest.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_IsolationForest.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.IsolationForest_skinterface import Is from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class IsolationForestSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class IsolationForestSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_KDiscordODetector.py b/tods/tests/sk_interface/detection_algorithm/test_ski_KDiscordODetector.py index 86d3b72..648547a 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_KDiscordODetector.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_KDiscordODetector.py @@ -5,40 +5,41 @@ from tods.sk_interface.detection_algorithm.KDiscordODetector_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class KDiscordODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 self.contamination = 0.1 self.roc_floor = 0.0 - self.window_size = 5 self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - self.transformer = KDiscordODetectorSKI(contamination=self.contamination, window_size=self.window_size) - self.y_test = self.y_test[self.window_size-1:] + self.transformer = KDiscordODetectorSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_KNN.py b/tods/tests/sk_interface/detection_algorithm/test_ski_KNN.py index 473a95d..a178214 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_KNN.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_KNN.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.KNN_skinterface import KNNSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class KNNSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class KNNSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_LODA.py b/tods/tests/sk_interface/detection_algorithm/test_ski_LODA.py index 857f0c4..933d96e 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_LODA.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_LODA.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LODA_skinterface import LODASKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LODASKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class LODASKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_LOF.py b/tods/tests/sk_interface/detection_algorithm/test_ski_LOF.py index f0114b3..6905696 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_LOF.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_LOF.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LOF_skinterface import LOFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LOFSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class LOFSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_LSTMODetector.py b/tods/tests/sk_interface/detection_algorithm/test_ski_LSTMODetector.py index 4c38131..7c84164 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_LSTMODetector.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_LSTMODetector.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.LSTMODetector_skinterface import LSTM from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class LSTMODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -26,21 +29,17 @@ class LSTMODetectorSKI_TestCase(unittest.TestCase): n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - #self.y_test = self.y_test[1:] - self.y_train = self.y_train[1:] - - - self.transformer = LSTMODetectorSKI(contamination=self.contamination, feature_dim=self.X_train.shape[1]) + self.transformer = LSTMODetectorSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_MatrixProfile.py b/tods/tests/sk_interface/detection_algorithm/test_ski_MatrixProfile.py index 32f9adf..969d714 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_MatrixProfile.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_MatrixProfile.py @@ -5,40 +5,41 @@ from tods.sk_interface.detection_algorithm.MatrixProfile_skinterface import Matr from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class MatrixProfileSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 self.contamination = 0.1 self.roc_floor = 0.0 - self.window_size = 5 self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - self.transformer = MatrixProfileSKI(contamination=self.contamination, window_size=self.window_size) + self.transformer = MatrixProfileSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - pred_scores = pred_scores[:,0] - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_Mo_Gaal.py b/tods/tests/sk_interface/detection_algorithm/test_ski_Mo_Gaal.py index a6cc75f..78d1181 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_Mo_Gaal.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_Mo_Gaal.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.Mo_Gaal_skinterface import Mo_GaalSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class Mo_GaalSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class Mo_GaalSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_OCSVM.py b/tods/tests/sk_interface/detection_algorithm/test_ski_OCSVM.py index ae6142d..04f253a 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_OCSVM.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_OCSVM.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.OCSVM_skinterface import OCSVMSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class OCSVMSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class OCSVMSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_PCAODetector.py b/tods/tests/sk_interface/detection_algorithm/test_ski_PCAODetector.py index 723aa80..dc2de2a 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_PCAODetector.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_PCAODetector.py @@ -5,41 +5,41 @@ from tods.sk_interface.detection_algorithm.PCAODetector_skinterface import PCAOD from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class PCAODetectorSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 self.contamination = 0.1 self.roc_floor = 0.0 - self.window_size = 5 self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - - self.transformer = PCAODetectorSKI(contamination=self.contamination, window_size=self.window_size) - self.y_test = self.y_test[self.window_size-1:] + self.transformer = PCAODetectorSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_SOD.py b/tods/tests/sk_interface/detection_algorithm/test_ski_SOD.py index 439cb22..229fac2 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_SOD.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_SOD.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.SOD_skinterface import SODSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class SODSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class SODSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_So_Gaal.py b/tods/tests/sk_interface/detection_algorithm/test_ski_So_Gaal.py index 36abfac..795f4f9 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_So_Gaal.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_So_Gaal.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.So_Gaal_skinterface import So_GaalSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class So_GaalSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class So_GaalSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_SystemWiseDetection.py b/tods/tests/sk_interface/detection_algorithm/test_ski_SystemWiseDetection.py new file mode 100644 index 0000000..8c58b67 --- /dev/null +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_SystemWiseDetection.py @@ -0,0 +1,46 @@ +import numpy as np +import pandas as pd +import os +from tods.sk_interface.detection_algorithm.SystemWiseDetection_skinterface import SystemWiseDetectionSKI + +from pyod.utils.data import generate_data +import unittest +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase +from sklearn.metrics import roc_auc_score + +class SystemWiseDetectionSKI_TestCase(unittest.TestCase): + def setUp(self): + + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + + self.maxDiff = None + self.n_train = 200 + self.n_test = 100 + self.contamination = 0.1 + self.roc_floor = 0.0 + self.X_train, self.y_train, self.X_test, self.y_test = generate_data( + n_train=self.n_train, n_test=self.n_test, + contamination=self.contamination, random_state=42) + + self.transformer = SystemWiseDetectionSKI(contamination=self.contamination) + self.transformer.fit(self.X_train) + + def test_prediction_labels(self): + pred_labels = self.transformer.predict(self.X_test) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + + def test_prediction_score(self): + pred_scores = self.transformer.predict_score(self.X_test) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + + +if __name__ == '__main__': + unittest.main() diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_Telemanom.py b/tods/tests/sk_interface/detection_algorithm/test_ski_Telemanom.py index a82e773..4031edd 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_Telemanom.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_Telemanom.py @@ -5,44 +5,41 @@ from tods.sk_interface.detection_algorithm.Telemanom_skinterface import Telemano from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class TelemanomSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 self.contamination = 0.1 self.roc_floor = 0.0 - self.l_s = 5 - self.n_predictions = 1 self.X_train, self.y_train, self.X_test, self.y_test = generate_data( n_train=self.n_train, n_test=self.n_test, contamination=self.contamination, random_state=42) - self.transformer = TelemanomSKI(contamination=self.contamination, l_s=self.l_s, n_predictions=self.n_predictions) - - self.y_test = self.y_test[self.l_s:-self.n_predictions] - self.y_train = self.y_train[self.l_s:-self.n_predictions] - + self.transformer = TelemanomSKI(contamination=self.contamination) self.transformer.fit(self.X_train) def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/detection_algorithm/test_ski_VariationalAutoEncoder.py b/tods/tests/sk_interface/detection_algorithm/test_ski_VariationalAutoEncoder.py index 6f95c42..ab9b7af 100644 --- a/tods/tests/sk_interface/detection_algorithm/test_ski_VariationalAutoEncoder.py +++ b/tods/tests/sk_interface/detection_algorithm/test_ski_VariationalAutoEncoder.py @@ -5,18 +5,21 @@ from tods.sk_interface.detection_algorithm.VariationalAutoEncoder_skinterface im from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises +from numpy.testing import assert_allclose +from numpy.testing import assert_array_less +from unittest import TestCase from sklearn.metrics import roc_auc_score class VariationalAutoEncoderSKI_TestCase(unittest.TestCase): def setUp(self): + _dummy = TestCase('__init__') + self.assert_greater_equal = _dummy.assertGreaterEqual + self.assert_greater = _dummy.assertGreater + self.assert_less_equal = _dummy.assertLessEqual + self.assert_less = _dummy.assertLess + self.assert_equal = _dummy.assertEqual + self.maxDiff = None self.n_train = 200 self.n_test = 100 @@ -31,12 +34,12 @@ class VariationalAutoEncoderSKI_TestCase(unittest.TestCase): def test_prediction_labels(self): pred_labels = self.transformer.predict(self.X_test) - assert_equal(pred_labels.shape[0], self.y_test.shape[0]) + self.assert_equal(pred_labels.shape[0], self.y_test.shape[0]) def test_prediction_score(self): pred_scores = self.transformer.predict_score(self.X_test) - assert_equal(pred_scores.shape[0], self.y_test.shape[0]) - assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) + self.assert_equal(pred_scores.shape[0], self.y_test.shape[0]) + self.assert_greater_equal(roc_auc_score(self.y_test, pred_scores), self.roc_floor) if __name__ == '__main__': diff --git a/tods/tests/sk_interface/feature_analysis/__init__.py b/tods/tests/sk_interface/feature_analysis/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_AutoCorrelation.py b/tods/tests/sk_interface/feature_analysis/test_ski_AutoCorrelation.py index 6dc3988..dc14887 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_AutoCorrelation.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_AutoCorrelation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.AutoCorrelation_skinterface import AutoC from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class AutoCorrelationSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_BKFilter.py b/tods/tests/sk_interface/feature_analysis/test_ski_BKFilter.py index 0012aa4..538cd52 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_BKFilter.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_BKFilter.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.BKFilter_skinterface import BKFilterSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class BKFilterSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_DiscreteCosineTransform.py b/tods/tests/sk_interface/feature_analysis/test_ski_DiscreteCosineTransform.py index a3bf8b7..5f13a82 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_DiscreteCosineTransform.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_DiscreteCosineTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.DiscreteCosineTransform_skinterface impo from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class DiscreteCosineTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_FastFourierTransform.py b/tods/tests/sk_interface/feature_analysis/test_ski_FastFourierTransform.py index 4bd5b79..4a0c0a9 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_FastFourierTransform.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_FastFourierTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.FastFourierTransform_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class FastFourierTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_HPFilter.py b/tods/tests/sk_interface/feature_analysis/test_ski_HPFilter.py index 484a6cb..fb53454 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_HPFilter.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_HPFilter.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.HPFilter_skinterface import HPFilterSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class HPFilterSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_NonNegativeMatrixFactorization.py b/tods/tests/sk_interface/feature_analysis/test_ski_NonNegativeMatrixFactorization.py index 994d1bd..1af73c8 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_NonNegativeMatrixFactorization.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_NonNegativeMatrixFactorization.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.NonNegativeMatrixFactorization_skinterfa from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class NonNegativeMatrixFactorizationSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_SKTruncatedSVD.py b/tods/tests/sk_interface/feature_analysis/test_ski_SKTruncatedSVD.py index 022ec4d..abe0dd5 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_SKTruncatedSVD.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_SKTruncatedSVD.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.SKTruncatedSVD_skinterface import SKTrun from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class SKTruncatedSVDSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_SpectralResidualTransform.py b/tods/tests/sk_interface/feature_analysis/test_ski_SpectralResidualTransform.py index 9555cf1..446f245 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_SpectralResidualTransform.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_SpectralResidualTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.SpectralResidualTransform_skinterface im from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class SpectralResidualTransformSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsEnergy.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsEnergy.py index 1937eb2..321cdb4 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsEnergy.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsEnergy.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalAbsEnergy_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalAbsEnergySKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsSum.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsSum.py index 53eb16d..b92c104 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsSum.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalAbsSum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalAbsSum_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalAbsSumSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalGmean.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalGmean.py index 2b98074..ec5588a 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalGmean.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalGmean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalGmean_skinterface import Stat from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalGmeanSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalHmean.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalHmean.py index e177bdb..6d7a57b 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalHmean.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalHmean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalHmean_skinterface import Stat from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalHmeanSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalKurtosis.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalKurtosis.py index f66ffba..fff0920 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalKurtosis.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalKurtosis.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalKurtosis_skinterface import S from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalKurtosisSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMaximum.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMaximum.py index 758ade9..95d9547 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMaximum.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMaximum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMaximum_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMaximumSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMean.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMean.py index 1eb6ad9..e6eacf0 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMean.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMean.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMean_skinterface import Stati from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbs.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbs.py index dda8d8d..9f5530b 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbs.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbs.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanAbs_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanAbsSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py index ae44653..03e17e9 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanAbsTemporalDerivative.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanAbsTemporalDerivative_ski from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanAbsTemporalDerivativeSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py index c2e3677..908ffb0 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMeanTemporalDerivative.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMeanTemporalDerivative_skinte from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMeanTemporalDerivativeSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedian.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedian.py index f35d242..140d017 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedian.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedian.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMedian_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMedianSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py index 86e1d23..fdd7559 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMedianAbsoluteDeviation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMedianAbsoluteDeviation_skint from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMedianAbsoluteDeviationSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMinimum.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMinimum.py index 0ca8b48..f42495e 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMinimum.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalMinimum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalMinimum_skinterface import St from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalMinimumSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalSkew.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalSkew.py index 30f7761..d3076c8 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalSkew.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalSkew.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalSkew_skinterface import Stati from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalSkewSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalStd.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalStd.py index a1da0a0..51aecf9 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalStd.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalStd.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalStd_skinterface import Statis from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalStdSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVar.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVar.py index 1cce000..1bd775a 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVar.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVar.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVar_skinterface import Statis from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVarSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVariation.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVariation.py index d72b393..ad92407 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVariation.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVariation.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVariation_skinterface import from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVariationSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVecSum.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVecSum.py index 4cf7dc2..bc218de 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVecSum.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalVecSum.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalVecSum_skinterface import Sta from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalVecSumSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalWillisonAmplitude.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalWillisonAmplitude.py index 8f27ff2..332f688 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalWillisonAmplitude.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalWillisonAmplitude.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalWillisonAmplitude_skinterface from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalWillisonAmplitudeSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalZeroCrossing.py b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalZeroCrossing.py index c0962fa..118998c 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalZeroCrossing.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_StatisticalZeroCrossing.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.StatisticalZeroCrossing_skinterface impo from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class StatisticalZeroCrossingSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_TRMF.py b/tods/tests/sk_interface/feature_analysis/test_ski_TRMF.py index 983385a..6bf9f10 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_TRMF.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_TRMF.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.TRMF_skinterface import TRMFSKI from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class TRMFSKI_TestCase(unittest.TestCase): diff --git a/tods/tests/sk_interface/feature_analysis/test_ski_WaveletTransform.py b/tods/tests/sk_interface/feature_analysis/test_ski_WaveletTransform.py index e96cd4e..398592e 100644 --- a/tods/tests/sk_interface/feature_analysis/test_ski_WaveletTransform.py +++ b/tods/tests/sk_interface/feature_analysis/test_ski_WaveletTransform.py @@ -5,13 +5,6 @@ from tods.sk_interface.feature_analysis.WaveletTransform_skinterface import Wave from pyod.utils.data import generate_data import unittest -from sklearn.utils.testing import assert_allclose -from sklearn.utils.testing import assert_array_less -from sklearn.utils.testing import assert_equal -from sklearn.utils.testing import assert_greater -from sklearn.utils.testing import assert_greater_equal -from sklearn.utils.testing import assert_less_equal -from sklearn.utils.testing import assert_raises from sklearn.metrics import roc_auc_score class WaveletTransformSKI_TestCase(unittest.TestCase):