Configurators: Move parameter_values to _Sampler

moi90 · Dec 26, 2023 · a8e7603 · a8e7603
1 parent b92935f
commit a8e7603
Show file tree

Hide file tree

Showing 9 changed files with 214 additions and 237 deletions.
diff --git a/experitur/configurators/pruning.py b/experitur/configurators/pruning.py
@@ -42,10 +42,6 @@ def __init__(
             "min_count": min_count,
         }
 
-    @property
-    def parameter_values(self):
-        return {}
-
     class _Sampler(ConfigurationSampler):
         configurator: "Prune"
 
@@ -58,3 +54,7 @@ def sample(self, exclude: Optional[Set] = None) -> Iterator[Mapping]:
                 )
 
                 yield merge_dicts(parent_configuration, pruning_config=pruning_config)
+
+        @property
+        def parameter_values(self):
+            return self.parent.parameter_values
diff --git a/experitur/configurators/random.py b/experitur/configurators/random.py
@@ -15,7 +15,11 @@
 from scipy.stats import distributions
 
 from experitur import get_current_context
-from experitur.core.configurators import ConfigurationSampler, Configurator
+from experitur.core.configurators import (
+    ConfigurationSampler,
+    Configurator,
+    merge_parameter_values,
+)
 from experitur.helpers.merge_dicts import merge_dicts
 
 
@@ -73,18 +77,10 @@ def __init__(self, distributions: Dict[str, Union[List, Any]], n_iter: int):
         self.distributions = distributions
         self.n_iter = n_iter
 
-    @property
-    def parameter_values(self) -> Mapping[str, Container]:
-        return {
-            k: tuple(v) if isinstance(v, Iterable) else _DistWrapper(v)
-            for k, v in self.distributions.items()
-        }
-
     class _Sampler(ConfigurationSampler):
         configurator: "Random"
 
         def sample(self, exclude: Optional[Set] = None) -> Iterator[Mapping]:
-
             distributions, exclude = self.prepare_values_exclude(
                 self.configurator.distributions, exclude
             )
@@ -137,3 +133,13 @@ def sample(self, exclude: Optional[Set] = None) -> Iterator[Mapping]:
                         break
 
                     yield merge_dicts(parent_configuration, parameters=params)
+
+        @property
+        def parameter_values(self) -> Mapping[str, Container]:
+            return merge_parameter_values(
+                self.parent.parameter_values,
+                {
+                    k: tuple(v) if isinstance(v, Iterable) else _DistWrapper(v)
+                    for k, v in self.configurator.distributions.items()
+                },
+            )