Skip to content

Commit 710bb66

Browse files
janezdjanezd
authored
Merge pull request #4252 from aturanjanin/_validation
Validation: Deprecated constructor calls removed
2 parents ad0004c + 4ef1bb3 commit 710bb66

15 files changed

+72
-40
lines changed

‎Orange/ensembles/stack.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ def __init__(self, learners, aggregate, k=5, preprocessors=None):
6969
self.params = vars()
7070

7171
def fit_storage(self, data):
72-
res = CrossValidation(data, self.learners, k=self.k)
72+
cv = CrossValidation(k=self.k)
73+
res = cv(data, self.learners)
7374
if data.domain.class_var.is_discrete:
7475
X = np.hstack(res.probabilities)
7576
use_prob = True

‎Orange/tests/test_ada_boost.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ def setUpClass(cls):
2121

2222
def test_adaboost(self):
2323
learn = SklAdaBoostClassificationLearner()
24-
results = CrossValidation(self.iris, [learn], k=3)
24+
cv = CrossValidation(k=3)
25+
results = cv(self.iris, [learn])
2526
ca = CA(results)
2627
self.assertGreater(ca, 0.9)
2728
self.assertLess(ca, 0.99)
@@ -34,7 +35,8 @@ def test_adaboost_base_estimator(self):
3435
base_estimator=stump_estimator, n_estimators=5)
3536
tree = SklAdaBoostClassificationLearner(
3637
base_estimator=tree_estimator, n_estimators=5)
37-
results = CrossValidation(self.iris, [stump, tree], k=4)
38+
cv = CrossValidation(k=4)
39+
results = cv(self.iris, [stump, tree])
3840
ca = CA(results)
3941
self.assertLessEqual(ca[0], ca[1])
4042

@@ -62,7 +64,8 @@ def test_adaboost_adequacy(self):
6264

6365
def test_adaboost_reg(self):
6466
learn = SklAdaBoostRegressionLearner()
65-
results = CrossValidation(self.housing, [learn], k=3)
67+
cv = CrossValidation(k=3)
68+
results = cv(self.housing, [learn])
6669
_ = RMSE(results)
6770

6871
def test_adaboost_reg_base_estimator(self):
@@ -71,7 +74,8 @@ def test_adaboost_reg_base_estimator(self):
7174
tree_estimator = SklTreeRegressionLearner()
7275
stump = SklAdaBoostRegressionLearner(base_estimator=stump_estimator)
7376
tree = SklAdaBoostRegressionLearner(base_estimator=tree_estimator)
74-
results = CrossValidation(self.housing, [stump, tree], k=3)
77+
cv = CrossValidation(k=3)
78+
results = cv(self.housing, [stump, tree])
7579
rmse = RMSE(results)
7680
self.assertGreaterEqual(rmse[0], rmse[1])
7781

‎Orange/tests/test_classification.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,17 @@ def test_multinomial(self):
238238
table = Table("titanic")
239239
lr = LogisticRegressionLearner()
240240
assert isinstance(lr, Orange.classification.SklLearner)
241-
res = CrossValidation(table, [lr], k=2)
241+
cv = CrossValidation(k=2)
242+
res = cv(table, [lr])
242243
self.assertGreater(Orange.evaluation.AUC(res)[0], 0.7)
243244
self.assertLess(Orange.evaluation.AUC(res)[0], 0.9)
244245

245246
def test_nan_columns(self):
246247
data = Orange.data.Table("iris")
247248
data.X[:, (1, 3)] = np.NaN
248249
lr = LogisticRegressionLearner()
249-
res = CrossValidation(data, [lr], k=2, store_models=True)
250+
cv = CrossValidation(k=2, store_models=True)
251+
res = cv(data, [lr])
250252
self.assertEqual(len(res.models[0][0].domain.attributes), 2)
251253
self.assertGreater(Orange.evaluation.CA(res)[0], 0.8)
252254

‎Orange/tests/test_knn.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ def setUpClass(cls):
1818
cls.housing = Table('housing')
1919

2020
def test_KNN(self):
21-
results = CrossValidation(self.iris, [KNNLearner()], k=3)
21+
cv = CrossValidation(k=3)
22+
results = cv(self.iris, [KNNLearner()])
2223
ca = CA(results)
2324
self.assertGreater(ca, 0.8)
2425
self.assertLess(ca, 0.99)
@@ -54,13 +55,15 @@ def test_random(self):
5455

5556
def test_KNN_mahalanobis(self):
5657
learners = [KNNLearner(metric="mahalanobis")]
57-
results = CrossValidation(self.iris, learners, k=3)
58+
cv = CrossValidation(k=3)
59+
results = cv(self.iris, learners)
5860
ca = CA(results)
5961
self.assertGreater(ca, 0.8)
6062

6163
def test_KNN_regression(self):
6264
learners = [KNNRegressionLearner(),
6365
KNNRegressionLearner(metric="mahalanobis")]
64-
results = CrossValidation(self.housing, learners, k=3)
66+
cv = CrossValidation(k=3)
67+
results = cv(self.housing, learners)
6568
mse = MSE(results)
6669
self.assertLess(mse[1], mse[0])

‎Orange/tests/test_linear_bfgs_regression.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ def test_preprocessors(self):
1313
table = Table('housing')
1414
learners = [LinearRegressionLearner(preprocessors=[]),
1515
LinearRegressionLearner()]
16-
results = CrossValidation(table, learners, k=3)
16+
cv = CrossValidation(k=3)
17+
results = cv(table, learners)
1718
rmse = RMSE(results)
1819
self.assertLess(rmse[0], rmse[1])

‎Orange/tests/test_linear_regression.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ def test_Regression(self):
4444
elasticCV = ElasticNetCVLearner()
4545
mean = MeanLearner()
4646
learners = [ridge, lasso, elastic, elasticCV, mean]
47-
res = CrossValidation(self.housing, learners, k=2)
47+
cv = CrossValidation(k=2)
48+
res = cv(self.housing, learners)
4849
rmse = RMSE(res)
4950
for i in range(len(learners) - 1):
5051
self.assertLess(rmse[i], rmse[-1])

‎Orange/tests/test_logistic_regression.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def setUpClass(cls):
2020

2121
def test_LogisticRegression(self):
2222
learn = LogisticRegressionLearner()
23-
results = CrossValidation(self.heart_disease, [learn], k=2)
23+
cv = CrossValidation(k=2)
24+
results = cv(self.heart_disease, [learn])
2425
ca = CA(results)
2526
self.assertGreater(ca, 0.8)
2627
self.assertLess(ca, 1.0)
@@ -40,7 +41,8 @@ def test_LogisticRegressionNormalization(self):
4041
lr_norm = LogisticRegressionLearner(normalize=True)
4142

4243
# check that normalization produces better results
43-
results = CrossValidation(table, [lr_norm, lr], k=3)
44+
cv = CrossValidation(k=3)
45+
results = cv(table, [lr_norm, lr])
4446
ca = CA(results)
4547
self.assertGreater(ca[0], ca[1])
4648

‎Orange/tests/test_naive_bayes.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ def setUp(self):
3232
self.model = self.learner(self.data)
3333

3434
def test_NaiveBayes(self):
35-
results = CrossValidation(self.table, [self.learner], k=10)
35+
cv = CrossValidation(k=10)
36+
results = cv(self.table, [self.learner])
3637
ca = CA(results)
3738
self.assertGreater(ca, 0.7)
3839
self.assertLess(ca, 0.9)
3940

40-
results = CrossValidation(Table("iris"), [self.learner], k=10)
41+
cv = CrossValidation(k=10)
42+
results = cv(Table("iris"), [self.learner])
4143
ca = CA(results)
4244
self.assertGreater(ca, 0.7)
4345

@@ -56,7 +58,8 @@ def test_degenerate(self):
5658
def test_allnan_cv(self):
5759
# GH 2740
5860
data = Table(test_filename('datasets/lenses.tab'))
59-
results = CrossValidation(data, [self.learner])
61+
cv = CrossValidation()
62+
results = cv(data, [self.learner])
6063
self.assertFalse(any(results.failed))
6164

6265
def test_prediction_routing(self):

‎Orange/tests/test_neural_network.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,27 @@ def setUp(self):
2626
super().setUp()
2727

2828
def test_NN_classification(self):
29-
results = CrossValidation(self.iris, [NNClassificationLearner()], k=3)
29+
cv = CrossValidation(k=3)
30+
results = cv(self.iris, [NNClassificationLearner()])
3031
ca = CA(results)
3132
self.assertGreater(ca, 0.8)
3233
self.assertLess(ca, 0.99)
3334

3435
def test_NN_regression(self):
3536
const = ConstantLearner()
36-
results = CrossValidation(self.housing, [NNRegressionLearner(), const],
37-
k=3)
37+
cv = CrossValidation(k=3)
38+
results = cv(self.housing, [NNRegressionLearner(), const])
3839
mse = MSE()
3940
res = mse(results)
4041
self.assertLess(res[0], 35)
4142
self.assertLess(res[0], res[1])
4243

4344
def test_NN_model(self):
44-
results = CrossValidation(self.iris, [self.learner], k=3)
45+
cv = CrossValidation(k=3)
46+
results = cv(self.iris, [self.learner])
4547
self.assertGreater(CA(results), 0.90)
46-
results = CrossValidation(self.housing, [self.learner], k=3)
48+
cv = CrossValidation(k=3)
49+
results = cv(self.housing, [self.learner])
4750
mse = MSE()
4851
res = mse(results)
4952
self.assertLess(res[0], 35)

‎Orange/tests/test_polynomial_learner.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def test_PolynomialLearner(self):
2121
polynomial2 = PolynomialLearner(linear, degree=2)
2222
polynomial3 = PolynomialLearner(linear, degree=3)
2323

24-
res = TestOnTrainingData(data,
25-
[linear, polynomial2, polynomial3])
24+
tt = TestOnTrainingData()
25+
res = tt(data, [linear, polynomial2, polynomial3])
2626
rmse = RMSE(res)
2727

2828
self.assertGreater(rmse[0], rmse[1])

0 commit comments

Comments
 (0)