Rename preset factory aliases

Author: AdrianSosic

baybe/surrogates/gaussian_process/core.py

@@ -225,14 +225,10 @@ def from_preset(
         )
         module = importlib.import_module(module_name)
 
-        kernel = kernel_or_factory or getattr(module, "PRESET_KERNEL_FACTORY")
-        mean = mean_or_factory or getattr(module, "PRESET_MEAN_FACTORY")
-        likelihood = likelihood_or_factory or getattr(
-            module, "PRESET_LIKELIHOOD_FACTORY"
-        )
-        criterion = criterion_or_factory or getattr(
-            module, "PRESET_FIT_CRITERION_FACTORY"
-        )
+        kernel = kernel_or_factory or getattr(module, "KERNEL_FACTORY")
+        mean = mean_or_factory or getattr(module, "MEAN_FACTORY")
+        likelihood = likelihood_or_factory or getattr(module, "LIKELIHOOD_FACTORY")
+        criterion = criterion_or_factory or getattr(module, "FIT_CRITERION_FACTORY")
 
         return cls(kernel, mean, likelihood, criterion)
 

baybe/surrogates/gaussian_process/presets/baybe.py

@@ -106,7 +106,7 @@ def __call__(
 
 
 # Preset defaults
-PRESET_KERNEL_FACTORY = BayBEKernelFactory()
-PRESET_MEAN_FACTORY = BayBEMeanFactory()
-PRESET_LIKELIHOOD_FACTORY = BayBELikelihoodFactory()
-PRESET_FIT_CRITERION_FACTORY = BayBEFitCriterionFactory()
+KERNEL_FACTORY = BayBEKernelFactory()
+MEAN_FACTORY = BayBEMeanFactory()
+LIKELIHOOD_FACTORY = BayBELikelihoodFactory()
+FIT_CRITERION_FACTORY = BayBEFitCriterionFactory()

baybe/surrogates/gaussian_process/presets/chen.py

@@ -79,7 +79,7 @@ def _make(
 gc.collect()
 
 # Preset defaults
-PRESET_KERNEL_FACTORY = CHENKernelFactory()
-PRESET_MEAN_FACTORY = LazyConstantMeanFactory()
-PRESET_LIKELIHOOD_FACTORY = LazyGaussianLikelihoodFactory()
-PRESET_FIT_CRITERION_FACTORY = CHENFitCriterionFactory
+KERNEL_FACTORY = CHENKernelFactory()
+MEAN_FACTORY = LazyConstantMeanFactory()
+LIKELIHOOD_FACTORY = LazyGaussianLikelihoodFactory()
+FIT_CRITERION_FACTORY = CHENFitCriterionFactory

baybe/surrogates/gaussian_process/presets/edbo.py

@@ -186,7 +186,7 @@ def __call__(
 gc.collect()
 
 # Preset defaults
-PRESET_KERNEL_FACTORY = EDBOKernelFactory()
-PRESET_MEAN_FACTORY = EDBOMeanFactory()
-PRESET_LIKELIHOOD_FACTORY = EDBOLikelihoodFactory()
-PRESET_FIT_CRITERION_FACTORY = EDBOFitCriterionFactory
+KERNEL_FACTORY = EDBOKernelFactory()
+MEAN_FACTORY = EDBOMeanFactory()
+LIKELIHOOD_FACTORY = EDBOLikelihoodFactory()
+FIT_CRITERION_FACTORY = EDBOFitCriterionFactory

baybe/surrogates/gaussian_process/presets/edbo_smoothed.py

@@ -139,7 +139,7 @@ def __call__(
 gc.collect()
 
 # Preset defaults
-PRESET_KERNEL_FACTORY = SmoothedEDBOKernelFactory()
-PRESET_MEAN_FACTORY = SmoothedEDBOMeanFactory()
-PRESET_LIKELIHOOD_FACTORY = SmoothedEDBOLikelihoodFactory()
-PRESET_FIT_CRITERION_FACTORY = SmoothedEDBOFitCriterionFactory
+KERNEL_FACTORY = SmoothedEDBOKernelFactory()
+MEAN_FACTORY = SmoothedEDBOMeanFactory()
+LIKELIHOOD_FACTORY = SmoothedEDBOLikelihoodFactory()
+FIT_CRITERION_FACTORY = SmoothedEDBOFitCriterionFactory