---

autotm/fitness/estimator.py

@@ -67,24 +67,13 @@ def _estimate(self, iter_num: int, population: List[Individual]) -> List[Individ
 class SurrogateEnabledFitnessEstimatorMixin(FitnessEstimator):
     SUPPORTED_CALC_SCHEMES = ["type1", "type2"]
 
-    def __init__(self,
-                 ibuilder: IndividualBuilder,
-                 surrogate: Surrogate,
-                 calc_scheme: str,
-                 speedup: bool = True,
-                 num_fitness_evaluations: Optional[int] = None,
-                 statistics_collector: Optional[StatisticsCollector] = None):
-        self.ibuilder = ibuilder
-        self.surrogate = surrogate
-        self.calc_scheme = calc_scheme
-        self.speedup = speedup
-
-        self.all_params: List[AbstractParams] = []
-        self.all_fitness: List[float] = []
+    ibuilder: IndividualBuilder
+    surrogate: Surrogate
+    calc_scheme: str
+    speedup: bool
 
-        if calc_scheme not in self.SUPPORTED_CALC_SCHEMES:
-            raise ValueError(f"Unexpected surrogate scheme! {self.calc_scheme}")
-        super().__init__(num_fitness_evaluations, statistics_collector)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
     @staticmethod
     def surrogate_iteration(iter_num: int) -> bool:
@@ -237,4 +226,21 @@ def _estimate(self, iter_num: int, population: List[Individual]) -> List[Individ
 
 
 class SurrogateEnabledComputableFitnessEstimator(ComputableFitnessEstimator, SurrogateEnabledFitnessEstimatorMixin):
-    pass
+    def __init__(self,
+                 ibuilder: IndividualBuilder,
+                 surrogate: Surrogate,
+                 calc_scheme: str,
+                 speedup: bool = True,
+                 num_fitness_evaluations: Optional[int] = None,
+                 statistics_collector: Optional[StatisticsCollector] = None):
+        self.ibuilder = ibuilder
+        self.surrogate = surrogate
+        self.calc_scheme = calc_scheme
+        self.speedup = speedup
+
+        self.all_params: List[AbstractParams] = []
+        self.all_fitness: List[float] = []
+
+        if calc_scheme not in self.SUPPORTED_CALC_SCHEMES:
+            raise ValueError(f"Unexpected surrogate scheme! {self.calc_scheme}")
+        super().__init__(ibuilder, num_fitness_evaluations, statistics_collector)