Fixed import issues

SKSurrogate/aml.py

@@ -125,13 +125,12 @@ def Generate(self, l):
 
 
 try:
-    from .structsearch import Real, Integer, Categorical, HDReal, BoxSample
+    from .structsearch import Real, Integer, Categorical, HDReal
 except:
     Real = lambda a, b: None
     Integer = lambda a, b: None
     Categorical = lambda a: None
     HDReal = lambda a, b: None
-    BoxSample = type('BoxSample', (object,), dict(check_constraints=lambda: None, sample=lambda x: None))
 
 default_config = {
     # Classifiers
@@ -375,7 +374,7 @@ def types(self):
             else:
                 self.config_types[alg] = 'transformer'
 
-    def add_surrogate(self, estimator, itrs, sampling=BoxSample, optim='L-BFGS-B'):
+    def add_surrogate(self, estimator, itrs, sampling=None, optim='L-BFGS-B'):
         """
         Adding a regressor for surrogate optimization procedure.
 
@@ -387,6 +386,9 @@ def add_surrogate(self, estimator, itrs, sampling=BoxSample, optim='L-BFGS-B'):
         """
         if self.surrogates is None:
             self.surrogates = []
+        if sampling is None:
+            from .structsearch import BoxSample
+            sampling = BoxSample
         self.surrogates.append((estimator, itrs, sampling, optim))
 
     def _cast(self, n, X, y):

SKSurrogate/structsearch.py

@@ -599,10 +599,13 @@ def __init__(self, a, b, **kwargs):
 
 try:
     from sklearn.model_selection._search import BaseSearchCV
+except:
+    BaseSearchCV = type('BaseSearchCV', (object,), dict())
+
+try:
     from Optimithon import NumericDiff
 except:
     NumericDiff = type('NumericDiff', (object,), dict(Simple=lambda: 0., ))
-    BaseSearchCV = type('BaseSearchCV', (object,), dict())
 
 
 class SurrogateRandomCV(BaseSearchCV):