From 7b1cc4e381bd87843d34059049a55b51b24c5b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=92=D0=B0=D1=81?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D0=B5=D0=B2?= Date: Mon, 23 Dec 2024 21:41:49 +0300 Subject: [PATCH 1/3] Remove deprecated fit_predict & fit_predict_score --- pyod/models/base.py | 75 ------------------------------- pyod/test/test_abod.py | 28 ------------ pyod/test/test_ae1svm.py | 14 ------ pyod/test/test_alad.py | 14 ------ pyod/test/test_auto_encoder.py | 13 ------ pyod/test/test_base.py | 7 --- pyod/test/test_cblof.py | 14 ------ pyod/test/test_cof.py | 28 ------------ pyod/test/test_copod.py | 14 ------ pyod/test/test_copod_parallel.py | 14 ------ pyod/test/test_deepsvdd.py | 14 ------ pyod/test/test_devnet.py | 14 ------ pyod/test/test_dif.py | 14 ------ pyod/test/test_ecod.py | 28 ------------ pyod/test/test_ecod_parallel.py | 14 ------ pyod/test/test_feature_bagging.py | 14 ------ pyod/test/test_hbos.py | 28 ------------ pyod/test/test_iforest.py | 14 ------ pyod/test/test_inne.py | 14 ------ pyod/test/test_kde.py | 14 ------ pyod/test/test_knn.py | 28 ------------ pyod/test/test_kpca.py | 14 ------ pyod/test/test_lmdd.py | 14 ------ pyod/test/test_loci.py | 14 ------ pyod/test/test_loda.py | 28 ------------ pyod/test/test_lof.py | 14 ------ pyod/test/test_lscp.py | 14 ------ pyod/test/test_lunar.py | 14 ------ pyod/test/test_mad.py | 22 --------- pyod/test/test_mcd.py | 14 ------ pyod/test/test_mo_gaal.py | 14 ------ pyod/test/test_ocsvm.py | 14 ------ pyod/test/test_pca.py | 14 ------ pyod/test/test_qmcd.py | 14 ------ pyod/test/test_rgraph.py | 14 ------ pyod/test/test_rod.py | 14 ------ pyod/test/test_sampling.py | 14 ------ pyod/test/test_so_gaal.py | 14 ------ pyod/test/test_so_gaal_new.py | 13 ------ pyod/test/test_sod.py | 14 ------ pyod/test/test_sos.py | 14 ------ pyod/test/test_suod.py | 14 ------ pyod/test/test_thresholds.py | 16 ------- pyod/test/test_vae.py | 13 ------ 44 files changed, 761 deletions(-) diff --git a/pyod/models/base.py b/pyod/models/base.py index a5a4880c..9267c6eb 100644 --- a/pyod/models/base.py +++ b/pyod/models/base.py @@ -16,7 +16,6 @@ from scipy.stats import binom from sklearn.metrics import roc_auc_score from sklearn.preprocessing import MinMaxScaler -from sklearn.utils import deprecated from sklearn.utils.multiclass import check_classification_targets from sklearn.utils.validation import check_is_fitted from scipy.optimize import root_scalar @@ -108,35 +107,6 @@ def decision_function(self, X): """ pass - @deprecated() - def fit_predict(self, X, y=None): - """Fit detector first and then predict whether a particular sample - is an outlier or not. y is ignored in unsupervised models. - - Parameters - ---------- - X : numpy array of shape (n_samples, n_features) - The input samples. - - y : Ignored - Not used, present for API consistency by convention. - - Returns - ------- - outlier_labels : numpy array of shape (n_samples,) - For each observation, tells whether - it should be considered as an outlier according to the - fitted model. 0 stands for inliers and 1 for outliers. - - .. deprecated:: 0.6.9 - `fit_predict` will be removed in pyod 0.8.0.; it will be - replaced by calling `fit` function first and then accessing - `labels_` attribute for consistency. - """ - - self.fit(X, y) - return self.labels_ - def predict(self, X, return_confidence=False): """Predict if a particular sample is an outlier or not. @@ -488,51 +458,6 @@ def _predict_rank(self, X, normalized=False): ranks = ranks / ranks.max() return ranks - @deprecated() - def fit_predict_score(self, X, y, scoring='roc_auc_score'): - """Fit the detector, predict on samples, and evaluate the model by - predefined metrics, e.g., ROC. - - Parameters - ---------- - X : numpy array of shape (n_samples, n_features) - The input samples. - - y : Ignored - Not used, present for API consistency by convention. - - scoring : str, optional (default='roc_auc_score') - Evaluation metric: - - - 'roc_auc_score': ROC score - - 'prc_n_score': Precision @ rank n score - - Returns - ------- - score : float - - .. deprecated:: 0.6.9 - `fit_predict_score` will be removed in pyod 0.8.0.; it will be - replaced by calling `fit` function first and then accessing - `labels_` attribute for consistency. Scoring could be done by - calling an evaluation method, e.g., AUC ROC. - """ - - self.fit(X) - - if scoring == 'roc_auc_score': - score = roc_auc_score(y, self.decision_scores_) - elif scoring == 'prc_n_score': - score = precision_n_scores(y, self.decision_scores_) - else: - raise NotImplementedError('PyOD built-in scoring only supports ' - 'ROC and Precision @ rank n') - - print("{metric}: {score}".format(metric=scoring, score=score)) - - return score - - def _set_n_classes(self, y): """Set the number of classes if `y` is presented, which is not expected. It could be useful for multi-class outlier detection. diff --git a/pyod/test/test_abod.py b/pyod/test/test_abod.py index a8964e8e..66ddd2f4 100644 --- a/pyod/test/test_abod.py +++ b/pyod/test/test_abod.py @@ -118,20 +118,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) @@ -216,20 +202,6 @@ def test_prediction_proba_linear_confidence(self): assert (confidence.min() >= 0) assert (confidence.max() <= 1) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - # def test_score(self): # self.clf.score(self.X_test, self.y_test) # self.clf.score(self.X_test, self.y_test, scoring='roc_auc_score') diff --git a/pyod/test/test_ae1svm.py b/pyod/test/test_ae1svm.py index a4d70135..404af465 100644 --- a/pyod/test/test_ae1svm.py +++ b/pyod/test/test_ae1svm.py @@ -98,10 +98,6 @@ def test_prediction_proba_linear_confidence(self): assert confidence.min() >= 0 assert confidence.max() <= 1 - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - def test_prediction_with_rejection(self): pred_labels = self.clf.predict_with_rejection(self.X_test, return_stats=False) @@ -117,16 +113,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): # for deep models this may not apply clone_clf = clone(self.clf) diff --git a/pyod/test/test_alad.py b/pyod/test/test_alad.py index 5ee1a87d..39d6f111 100644 --- a/pyod/test/test_alad.py +++ b/pyod/test/test_alad.py @@ -134,20 +134,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_prediction_scores_with_sigmoid(self): self.alad = ALAD(activation_hidden_gen='sigmoid', activation_hidden_disc='sigmoid') diff --git a/pyod/test/test_auto_encoder.py b/pyod/test/test_auto_encoder.py index 5749c4d7..c92db7c6 100644 --- a/pyod/test/test_auto_encoder.py +++ b/pyod/test/test_auto_encoder.py @@ -114,19 +114,6 @@ def test_prediction_with_rejection_stats(self): self.assertLessEqual(ub_rejrate, 1) self.assertGreaterEqual(ub_cost, 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - self.assertEqual(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - self.assertRaises(NotImplementedError, self.clf.fit_predict_score, - self.X_test, self.y_test, scoring='something') - def tearDown(self): pass diff --git a/pyod/test/test_base.py b/pyod/test/test_base.py index 7c116b57..e1326ef3 100644 --- a/pyod/test/test_base.py +++ b/pyod/test/test_base.py @@ -157,13 +157,6 @@ def test_fit(self): self.dummy_clf = Dummy2() assert_equal(self.dummy_clf.fit(0), 0) - def test_fit_predict(self): - # TODO: add more testcases - - self.dummy_clf = Dummy3() - - assert_equal(self.dummy_clf.fit_predict(0), 0) - def test_predict_proba(self): # TODO: create uniform testcases pass diff --git a/pyod/test/test_cblof.py b/pyod/test/test_cblof.py index ac4159b4..55fa1dd8 100644 --- a/pyod/test/test_cblof.py +++ b/pyod/test/test_cblof.py @@ -131,20 +131,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_cof.py b/pyod/test/test_cof.py index 2e91d4b3..1220bbc7 100644 --- a/pyod/test/test_cof.py +++ b/pyod/test/test_cof.py @@ -114,20 +114,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) @@ -223,20 +209,6 @@ def test_prediction_proba_parameter(self): with assert_raises(ValueError): self.clf.predict_proba(self.X_test, method='something') - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_copod.py b/pyod/test/test_copod.py index 1a73c250..ae3bce08 100644 --- a/pyod/test/test_copod.py +++ b/pyod/test/test_copod.py @@ -112,20 +112,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_copod_parallel.py b/pyod/test/test_copod_parallel.py index 22f4b094..ff77fa41 100644 --- a/pyod/test/test_copod_parallel.py +++ b/pyod/test/test_copod_parallel.py @@ -124,20 +124,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_deepsvdd.py b/pyod/test/test_deepsvdd.py index 94b995a0..4412514c 100644 --- a/pyod/test/test_deepsvdd.py +++ b/pyod/test/test_deepsvdd.py @@ -126,20 +126,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) clone_clf = clone(self.clf_ae) diff --git a/pyod/test/test_devnet.py b/pyod/test/test_devnet.py index 9f33b251..b7499b8c 100644 --- a/pyod/test/test_devnet.py +++ b/pyod/test/test_devnet.py @@ -120,20 +120,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train, self.y_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): pass # clone_clf = clone(self.clf) diff --git a/pyod/test/test_dif.py b/pyod/test/test_dif.py index a2ba68f1..576a74d4 100644 --- a/pyod/test/test_dif.py +++ b/pyod/test/test_dif.py @@ -117,20 +117,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): pass diff --git a/pyod/test/test_ecod.py b/pyod/test/test_ecod.py index 4507742c..60764adc 100644 --- a/pyod/test/test_ecod.py +++ b/pyod/test/test_ecod.py @@ -112,20 +112,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) @@ -238,20 +224,6 @@ def test_prediction_proba_linear_confidence(self): assert (confidence.min() >= 0) assert (confidence.max() <= 1) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_ecod_parallel.py b/pyod/test/test_ecod_parallel.py index 2ff3c335..43a8bebe 100644 --- a/pyod/test/test_ecod_parallel.py +++ b/pyod/test/test_ecod_parallel.py @@ -124,20 +124,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_feature_bagging.py b/pyod/test/test_feature_bagging.py index 2c9bc977..d5125f31 100644 --- a/pyod/test/test_feature_bagging.py +++ b/pyod/test/test_feature_bagging.py @@ -120,20 +120,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_hbos.py b/pyod/test/test_hbos.py index 5e037e96..235444a4 100644 --- a/pyod/test/test_hbos.py +++ b/pyod/test/test_hbos.py @@ -101,20 +101,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - # def test_score(self): # self.clf.score(self.X_test, self.y_test) # self.clf.score(self.X_test, self.y_test, scoring='roc_auc_score') @@ -230,20 +216,6 @@ def test_prediction_proba_linear_confidence(self): assert (confidence.min() >= 0) assert (confidence.max() <= 1) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - # def test_score(self): # self.clf.score(self.X_test, self.y_test) # self.clf.score(self.X_test, self.y_test, scoring='roc_auc_score') diff --git a/pyod/test/test_iforest.py b/pyod/test/test_iforest.py index 72dba220..7cbc0a39 100644 --- a/pyod/test/test_iforest.py +++ b/pyod/test/test_iforest.py @@ -128,20 +128,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_inne.py b/pyod/test/test_inne.py index 68b9a2eb..1464d3a2 100644 --- a/pyod/test/test_inne.py +++ b/pyod/test/test_inne.py @@ -118,20 +118,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_kde.py b/pyod/test/test_kde.py index 432ed653..f29ddb13 100644 --- a/pyod/test/test_kde.py +++ b/pyod/test/test_kde.py @@ -116,20 +116,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="roc_auc_score") - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="prc_n_score") - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="something") - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_knn.py b/pyod/test/test_knn.py index 1f23b523..541e8b08 100644 --- a/pyod/test/test_knn.py +++ b/pyod/test/test_knn.py @@ -103,20 +103,6 @@ def test_prediction_proba_linear_confidence(self): assert (confidence.min() >= 0) assert (confidence.max() <= 1) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) @@ -296,20 +282,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_kpca.py b/pyod/test/test_kpca.py index ec543b9c..9fbf34d9 100644 --- a/pyod/test/test_kpca.py +++ b/pyod/test/test_kpca.py @@ -113,20 +113,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="roc_auc_score") - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="prc_n_score") - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="something") - def test_model_clone(self): clone_clf = clone(self.clf) diff --git a/pyod/test/test_lmdd.py b/pyod/test/test_lmdd.py index b3832ff2..a0f135e0 100644 --- a/pyod/test/test_lmdd.py +++ b/pyod/test/test_lmdd.py @@ -119,20 +119,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_check_parameters(self): with assert_raises(ValueError): LMDD(contamination=10.) diff --git a/pyod/test/test_loci.py b/pyod/test/test_loci.py index 1086c428..5dc2b720 100644 --- a/pyod/test/test_loci.py +++ b/pyod/test/test_loci.py @@ -113,20 +113,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_loda.py b/pyod/test/test_loda.py index f74fcd2d..c6876d67 100644 --- a/pyod/test/test_loda.py +++ b/pyod/test/test_loda.py @@ -115,20 +115,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) @@ -198,20 +184,6 @@ def test_prediction_proba_parameter(self): with assert_raises(ValueError): self.clf.predict_proba(self.X_test, method='something') - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) diff --git a/pyod/test/test_lof.py b/pyod/test/test_lof.py index 01b04431..8a36ab2c 100644 --- a/pyod/test/test_lof.py +++ b/pyod/test/test_lof.py @@ -118,20 +118,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_lscp.py b/pyod/test/test_lscp.py index d14685ed..4e3c896f 100644 --- a/pyod/test/test_lscp.py +++ b/pyod/test/test_lscp.py @@ -140,20 +140,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_lunar.py b/pyod/test/test_lunar.py index 994562da..851d35d3 100644 --- a/pyod/test/test_lunar.py +++ b/pyod/test/test_lunar.py @@ -115,20 +115,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_mad.py b/pyod/test/test_mad.py index dde99ce8..8de9fe08 100644 --- a/pyod/test/test_mad.py +++ b/pyod/test/test_mad.py @@ -128,28 +128,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_with_nan(self): - pred_labels = self.clf_nan.fit_predict(self.X_train_nan) - assert_equal(pred_labels.shape, self.y_train_nan.shape) - - def test_fit_predict_with_inf(self): - pred_labels = self.clf_inf.fit_predict(self.X_train_inf) - assert_equal(pred_labels.shape, self.y_train_inf.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_mcd.py b/pyod/test/test_mcd.py index b0e8bd57..8d36d53a 100644 --- a/pyod/test/test_mcd.py +++ b/pyod/test/test_mcd.py @@ -130,20 +130,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_mo_gaal.py b/pyod/test/test_mo_gaal.py index 51ff68a0..560d05b2 100644 --- a/pyod/test/test_mo_gaal.py +++ b/pyod/test/test_mo_gaal.py @@ -124,20 +124,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) diff --git a/pyod/test/test_ocsvm.py b/pyod/test/test_ocsvm.py index c11cdda6..94f2f9bd 100644 --- a/pyod/test/test_ocsvm.py +++ b/pyod/test/test_ocsvm.py @@ -128,20 +128,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_pca.py b/pyod/test/test_pca.py index c84fd13b..f46392ff 100644 --- a/pyod/test/test_pca.py +++ b/pyod/test/test_pca.py @@ -121,20 +121,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_qmcd.py b/pyod/test/test_qmcd.py index ded2f6ac..307a8dab 100644 --- a/pyod/test/test_qmcd.py +++ b/pyod/test/test_qmcd.py @@ -119,20 +119,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="roc_auc_score") - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="prc_n_score") - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="something") - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_rgraph.py b/pyod/test/test_rgraph.py index ebbb5e48..bba60ac6 100644 --- a/pyod/test/test_rgraph.py +++ b/pyod/test/test_rgraph.py @@ -126,20 +126,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): # for deep models this may not apply clone_clf = clone(self.clf) diff --git a/pyod/test/test_rod.py b/pyod/test/test_rod.py index 48fac323..5c7c0f2c 100644 --- a/pyod/test/test_rod.py +++ b/pyod/test/test_rod.py @@ -102,20 +102,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_sampling.py b/pyod/test/test_sampling.py index 0e1bf6a2..412f3fc1 100644 --- a/pyod/test/test_sampling.py +++ b/pyod/test/test_sampling.py @@ -119,20 +119,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="roc_auc_score") - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="prc_n_score") - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="something") - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_so_gaal.py b/pyod/test/test_so_gaal.py index e9f0ef35..1e28b7d0 100644 --- a/pyod/test/test_so_gaal.py +++ b/pyod/test/test_so_gaal.py @@ -122,20 +122,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_model_clone(self): clone_clf = clone(self.clf) diff --git a/pyod/test/test_so_gaal_new.py b/pyod/test/test_so_gaal_new.py index 2f96f85f..927c33db 100644 --- a/pyod/test/test_so_gaal_new.py +++ b/pyod/test/test_so_gaal_new.py @@ -115,19 +115,6 @@ def test_prediction_with_rejection_stats(self): self.assertLessEqual(ub_rejrate, 1) self.assertGreaterEqual(ub_cost, 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - self.assertEqual(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - self.assertRaises(NotImplementedError, self.clf.fit_predict_score, - self.X_test, self.y_test, scoring='something') - def tearDown(self): pass diff --git a/pyod/test/test_sod.py b/pyod/test/test_sod.py index a7fb2cc2..993c961f 100644 --- a/pyod/test/test_sod.py +++ b/pyod/test/test_sod.py @@ -140,20 +140,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_sos.py b/pyod/test/test_sos.py index 94fc92ad..f802d28f 100644 --- a/pyod/test/test_sos.py +++ b/pyod/test/test_sos.py @@ -113,20 +113,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - def test_predict_rank(self): pred_socres = self.clf.decision_function(self.X_test) pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_suod.py b/pyod/test/test_suod.py index 131ad3e3..8efd87ac 100644 --- a/pyod/test/test_suod.py +++ b/pyod/test/test_suod.py @@ -139,20 +139,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='something') - # def test_predict_rank(self): # pred_socres = self.clf.decision_function(self.X_test) # pred_ranks = self.clf._predict_rank(self.X_test) diff --git a/pyod/test/test_thresholds.py b/pyod/test/test_thresholds.py index 2c190d95..9a0f8490 100644 --- a/pyod/test/test_thresholds.py +++ b/pyod/test/test_thresholds.py @@ -130,22 +130,6 @@ def test_prediction_proba_linear_confidence(self): assert confidence.min() >= 0 assert confidence.max() <= 1 - @unittest.skipIf(not py_ver, 'Python 3.6 not included') - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - assert_equal(pred_labels.shape, self.y_train.shape) - - @unittest.skipIf(not py_ver, 'Python 3.6 not included') - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="roc_auc_score") - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="prc_n_score") - with assert_raises(NotImplementedError): - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring="something") - @unittest.skipIf(not py_ver, 'Python 3.6 not included') def test_predict_rank(self): pred_scores = self.clf.decision_function(self.X_test) diff --git a/pyod/test/test_vae.py b/pyod/test/test_vae.py index fcbcb1ee..1dc9e29a 100644 --- a/pyod/test/test_vae.py +++ b/pyod/test/test_vae.py @@ -113,19 +113,6 @@ def test_prediction_with_rejection_stats(self): self.assertLessEqual(ub_rejrate, 1) self.assertGreaterEqual(ub_cost, 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train) - self.assertEqual(pred_labels.shape, self.y_train.shape) - - def test_fit_predict_score(self): - self.clf.fit_predict_score(self.X_test, self.y_test) - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='roc_auc_score') - self.clf.fit_predict_score(self.X_test, self.y_test, - scoring='prc_n_score') - self.assertRaises(NotImplementedError, self.clf.fit_predict_score, - self.X_test, self.y_test, scoring='something') - def tearDown(self): pass From 433815b0686519a3608e97ac7517626cb31df879 Mon Sep 17 00:00:00 2001 From: Michael Vasilev Date: Tue, 24 Dec 2024 09:19:48 +0300 Subject: [PATCH 2/3] Revert changes in test_devnet.py --- pyod/test/test_devnet.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pyod/test/test_devnet.py b/pyod/test/test_devnet.py index b7499b8c..9f33b251 100644 --- a/pyod/test/test_devnet.py +++ b/pyod/test/test_devnet.py @@ -120,6 +120,20 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) + def test_fit_predict(self): + pred_labels = self.clf.fit_predict(self.X_train, self.y_train) + assert_equal(pred_labels.shape, self.y_train.shape) + + def test_fit_predict_score(self): + self.clf.fit_predict_score(self.X_test, self.y_test) + self.clf.fit_predict_score(self.X_test, self.y_test, + scoring='roc_auc_score') + self.clf.fit_predict_score(self.X_test, self.y_test, + scoring='prc_n_score') + with assert_raises(NotImplementedError): + self.clf.fit_predict_score(self.X_test, self.y_test, + scoring='something') + def test_model_clone(self): pass # clone_clf = clone(self.clf) From aef993b491baecc1a8de023c1a44530dc30554f4 Mon Sep 17 00:00:00 2001 From: Michael Vasilev Date: Tue, 24 Dec 2024 09:44:29 +0300 Subject: [PATCH 3/3] Remove test_fit_predict from test_devnet.py --- pyod/test/test_devnet.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyod/test/test_devnet.py b/pyod/test/test_devnet.py index 9f33b251..d2e87928 100644 --- a/pyod/test/test_devnet.py +++ b/pyod/test/test_devnet.py @@ -120,10 +120,6 @@ def test_prediction_with_rejection_stats(self): assert (ub_rejrate <= 1) assert (ub_cost >= 0) - def test_fit_predict(self): - pred_labels = self.clf.fit_predict(self.X_train, self.y_train) - assert_equal(pred_labels.shape, self.y_train.shape) - def test_fit_predict_score(self): self.clf.fit_predict_score(self.X_test, self.y_test) self.clf.fit_predict_score(self.X_test, self.y_test,