FIX checking for SPARSE and itertaive fit; None if test can't run

Author: KEggensperger

test/test_pipeline/components/regression/test_adaboost.py

@@ -11,13 +11,13 @@ class AdaBoostComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.60525743737887405
-    res["default_boston_iterative"] = -1
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = 0.22111559712318207
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.25129853514492517
-    res["default_diabetes_iterative"] = -1
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = 0.090755670764629537
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.ensemble.AdaBoostRegressor
 

test/test_pipeline/components/regression/test_ard_regression.py

@@ -11,13 +11,13 @@ class ARDRegressionComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.70316694175513961
-    res["default_boston_iterative"] = -1
-    res["default_boston_sparse"] = -1
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative"] = None
+    res["default_boston_sparse"] = None
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.4172236487551515
-    res["default_diabetes_iterative"] = -1
-    res["default_diabetes_sparse"] = -1
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative"] = None
+    res["default_diabetes_sparse"] = None
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.linear_model.ARDRegression
 

test/test_pipeline/components/regression/test_base.py

@@ -6,7 +6,6 @@
 from autosklearn.pipeline.constants import *
 
 import sklearn.metrics
-import numpy as np
 
 
 class BaseRegressionComponentTest(unittest.TestCase):
@@ -59,6 +58,8 @@ def test_default_boston_iterative_fit(self):
     def test_default_boston_iterative_sparse_fit(self):
         if not hasattr(self.module, 'iterative_fit'):
             return
+        if SPARSE not in self.module.get_properties()["input"]:
+            return
 
         for i in range(2):
             predictions, targets = \
@@ -115,6 +116,8 @@ def test_default_diabetes_iterative_fit(self):
     def test_default_diabetes_iterative_sparse_fit(self):
         if not hasattr(self.module, 'iterative_fit'):
             return
+        if SPARSE not in self.module.get_properties()["input"]:
+            return
 
         for i in range(2):
             predictions, targets = \

test/test_pipeline/components/regression/test_decision_tree.py

@@ -11,13 +11,13 @@ class DecisionTreeComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.35616796434879905
-    res["default_boston_iterative"] = -1
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = 0.18031669797027394
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.1564592449511697
-    res["default_diabetes_iterative"] = -1
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = -0.020818312539637507
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.tree.DecisionTreeRegressor
 

test/test_pipeline/components/regression/test_gaussian_process.py

@@ -13,13 +13,13 @@ class GaussianProcessComponentTest(BaseRegressionComponentTest):
     res = dict()
     res["default_boston_le_ge"] = [0.6, 0.4]
     res["default_boston_places"] = 1
-    res["default_boston_iterative"] = -1
-    res["default_boston_sparse"] = -1
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative"] = None
+    res["default_boston_sparse"] = None
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = -7.4131230585194885e-06
-    res["default_diabetes_iterative"] = -1
-    res["default_diabetes_sparse"] = -1
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative"] = None
+    res["default_diabetes_sparse"] = None
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.gaussian_process.GaussianProcessRegressor
 

test/test_pipeline/components/regression/test_gradient_boosting.py

@@ -1,6 +1,7 @@
 import sklearn.ensemble
 
-from autosklearn.pipeline.components.regression.gradient_boosting import GradientBoosting
+from autosklearn.pipeline.components.regression.gradient_boosting import \
+    GradientBoosting
 
 from .test_base import BaseRegressionComponentTest
 
@@ -12,12 +13,12 @@ class GradientBoostingComponentTest(BaseRegressionComponentTest):
     res = dict()
     res["default_boston"] = 0.83961954550470863
     res["default_boston_iterative"] = 0.83961954550470863
-    res["default_boston_sparse"] = 0.0
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_sparse"] = None
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.37192663934006487
     res["default_diabetes_iterative"] = 0.37192663934006487
-    res["default_diabetes_sparse"] = 0.0
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_sparse"] = None
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.ensemble.GradientBoostingRegressor
 

test/test_pipeline/components/regression/test_k_nearest_neighbors.py

@@ -11,13 +11,13 @@ class KNearestNeighborsComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.18393287980040374
-    res["default_boston_iterative"] = 0.0
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = -0.23029229186279609
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.068600456340847438
-    res["default_diabetes_iterative"] = 0.0
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = -0.16321841460809972
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.neighbors.KNeighborsRegressor
 

test/test_pipeline/components/regression/test_liblinear_svr.py

@@ -10,13 +10,13 @@ class SupportVectorComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.6768297818275556
-    res["default_boston_iterative"] = 0.0
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = 0.12626519114138912
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.39152218711865661
-    res["default_diabetes_iterative"] = 0.0
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = 0.18704323088631891
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.svm.LinearSVR
 

test/test_pipeline/components/regression/test_ridge_regression.py

@@ -10,13 +10,13 @@ class RidgeComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = 0.70337988453496891
-    res["default_boston_iterative"] = 0.0
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = 0.11243478302989141
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.32614416980439365
-    res["default_diabetes_iterative"] = 0.0
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = 0.12989713186102791
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.linear_model.Ridge
 

test/test_pipeline/components/regression/test_support_vector_regression.py

@@ -9,13 +9,13 @@ class SupportVectorComponentTest(BaseRegressionComponentTest):
 
     res = dict()
     res["default_boston"] = -0.030006883949312613
-    res["default_boston_iterative"] = 0.0
+    res["default_boston_iterative"] = None
     res["default_boston_sparse"] = -0.062749211736050192
-    res["default_boston_iterative_sparse"] = 0.0
+    res["default_boston_iterative_sparse"] = None
     res["default_diabetes"] = 0.12849591861430087
-    res["default_diabetes_iterative"] = 0.0
+    res["default_diabetes_iterative"] = None
     res["default_diabetes_sparse"] = 0.0098877566961463881
-    res["default_diabetes_iterative_sparse"] = 0.0
+    res["default_diabetes_iterative_sparse"] = None
 
     sk_mod = sklearn.svm.SVR