create separate module for gfo-adapter

Author: SimonBlanke

src/hyperactive/opt/_adapters/_gfo/__init__.py

@@ -0,0 +1,5 @@
+"""Adapters for individual packages."""
+
+# copyright: hyperactive developers, MIT License (see LICENSE file)
+
+from ._gfo import _BaseGFOadapter

src/hyperactive/opt/_adapters/_gfo.py …c/hyperactive/opt/_adapters/_gfo/_gfo.pysrc/hyperactive/opt/_adapters/_gfo.py renamed to src/hyperactive/opt/_adapters/_gfo/_gfo.py src/hyperactive/opt/_adapters/_gfo.py renamed to src/hyperactive/opt/_adapters/_gfo/_gfo.py

@@ -6,6 +6,8 @@
 from hyperactive.base import BaseOptimizer
 from skbase.utils.stdout_mute import StdoutMute
 
+from ._objective_function import ObjectiveFunction
+
 __all__ = ["_BaseGFOadapter"]
 
 
@@ -58,7 +60,10 @@ def get_search_config(self):
 
         search_config = self._handle_gfo_defaults(search_config)
 
-        search_config["search_space"] = self._to_dict_np(search_config["search_space"])
+        self.search_space_hyper = search_config["search_space"]
+        search_config["search_space"] = self._conv_search_space(
+            search_config["search_space"]
+        )
 
         return search_config
 
@@ -85,6 +90,18 @@ def _handle_gfo_defaults(self, search_config):
 
         return search_config
 
+    @staticmethod
+    def _conv_search_space(search_space):
+        # convert hyper search-space into gfo search-space
+        search_space_gfo = {}
+        for key in search_space.keys():
+            search_space_gfo[key] = np.array(range(len(search_space[key])))
+        return search_space_gfo
+
+    @staticmethod
+    def _conv_objective_function(objective_function, search_space):
+        return ObjectiveFunction(objective_function).convert(search_space)
+
     def _to_dict_np(self, search_space):
         """Coerce the search space to a format suitable for gfo optimizers.
 
@@ -108,7 +125,7 @@ def coerce_to_numpy(arr):
             if not isinstance(arr, np.ndarray):
                 return np.array(arr)
             return arr
-        
+
         coerced_search_space = {k: coerce_to_numpy(v) for k, v in search_space.items()}
         return coerced_search_space
 
@@ -129,23 +146,18 @@ def _run(self, experiment, **search_config):
         n_iter = search_config.pop("n_iter", 100)
         max_time = search_config.pop("max_time", None)
 
-        # convert hyper search-space into gfo search-space
-        search_space_hyper = search_config["search_space"]
-        search_space_gfo = {}
-        for key in search_space_hyper.keys():
-            search_space_gfo[key] = np.array(range(len(search_space_hyper[key])))
-        search_config["search_space"] = search_space_gfo
-
         gfo_cls = self._get_gfo_class()
-        hcopt = gfo_cls(**search_config)
+        opt = gfo_cls(**search_config)
+
+        score = self._conv_objective_function(experiment, self.search_space_hyper)
 
         with StdoutMute(active=not self.verbose):
-            hcopt.search(
-                objective_function=experiment.score,
+            opt.search(
+                objective_function=score,
                 n_iter=n_iter,
                 max_time=max_time,
             )
-        best_params = hcopt.best_para
+        best_params = opt.best_para
         return best_params
 
     @classmethod

src/hyperactive/opt/_adapters/_gfo/_objective_function.py

@@ -0,0 +1,37 @@
+# Author: Simon Blanke
+# Email: simon.blanke@yahoo.com
+# License: MIT License
+
+
+from .dictionary import DictClass
+
+
+def gfo2hyper(search_space, para):
+    values_dict = {}
+    for _, key in enumerate(search_space.keys()):
+        pos_ = int(para[key])
+        values_dict[key] = search_space[key][pos_]
+
+    return values_dict
+
+
+class ObjectiveFunction(DictClass):
+    def __init__(self, objective_function):
+        super().__init__()
+
+        self.objective_function = objective_function
+
+    def run_callbacks(self, type_):
+        if self.callbacks and type_ in self.callbacks:
+            [callback(self) for callback in self.callbacks[type_]]
+
+    def convert(self, search_space):
+        # wrapper for GFOs
+        def _model(para):
+            para = gfo2hyper(search_space, para)
+            self.para_dict = para
+
+            return self.objective_function(self)
+
+        _model.__name__ = self.objective_function.__name__
+        return _model

src/hyperactive/opt/_adapters/_gfo/dictionary.py

@@ -0,0 +1,17 @@
+# Author: Simon Blanke
+# Email: simon.blanke@yahoo.com
+# License: MIT License
+
+
+class DictClass:
+    def __init__(self):
+        self.para_dict = {}
+
+    def __getitem__(self, key):
+        return self.para_dict[key]
+
+    def keys(self):
+        return self.para_dict.keys()
+
+    def values(self):
+        return self.para_dict.values()