From e7ee25bfc59495e076265577638b8f58733f8912 Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Wed, 21 Feb 2024 13:52:18 +0100 Subject: make SymbolicRegressionFunction inherit from SKLearnRegressionFunction --- lib/model.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/model.py') diff --git a/lib/model.py b/lib/model.py index 26c4646..b92a50c 100644 --- a/lib/model.py +++ b/lib/model.py @@ -308,6 +308,8 @@ class AnalyticModel: self.attr_by_name[name][attr].build_fol() elif model_type == "lmt": self.attr_by_name[name][attr].build_lmt() + elif model_type == "symreg": + self.attr_by_name[name][attr].build_symreg() elif model_type == "xgb": self.attr_by_name[name][attr].build_xgb() else: @@ -332,7 +334,6 @@ class AnalyticModel: else: paramfit = ParamFit() tree_allowed = bool(int(os.getenv("DFATOOL_RMT_ENABLED", "1"))) - use_symreg = bool(int(os.getenv("DFATOOL_FIT_SYMREG", "0"))) tree_required = dict() for name in self.names: @@ -340,8 +341,6 @@ class AnalyticModel: for attr in self.attr_by_name[name].keys(): if self.attr_by_name[name][attr].function_override is not None: self.attr_by_name[name][attr].fit_override_function() - elif use_symreg: - self.attr_by_name[name][attr].build_symreg_model() elif self.attr_by_name[name][ attr ].all_relevant_parameters_are_none_or_numeric(): -- cgit v1.2.3