From 10a3b0db4d6541baf4caebef555977c17086012a Mon Sep 17 00:00:00 2001 From: Birte Kristina Friesel Date: Wed, 21 Feb 2024 12:57:08 +0100 Subject: Rename DFATOOL_DTREE_* to DFATOOL_RMT_* --- lib/model.py | 2 +- lib/parameters.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/model.py b/lib/model.py index 715ccb1..3d3e45d 100644 --- a/lib/model.py +++ b/lib/model.py @@ -331,7 +331,7 @@ class AnalyticModel: ) else: paramfit = ParamFit() - tree_allowed = bool(int(os.getenv("DFATOOL_DTREE_ENABLED", "1"))) + tree_allowed = bool(int(os.getenv("DFATOOL_RMT_ENABLED", "1"))) use_symreg = bool(int(os.getenv("DFATOOL_FIT_SYMREG", "0"))) tree_required = dict() diff --git a/lib/parameters.py b/lib/parameters.py index e4499ce..390420e 100644 --- a/lib/parameters.py +++ b/lib/parameters.py @@ -832,7 +832,7 @@ class ModelAttribute: def build_symreg_model(self): ignore_irrelevant = bool( - int(os.getenv("DFATOOL_DTREE_IGNORE_IRRELEVANT_PARAMS", "0")) + int(os.getenv("DFATOOL_RMT_IGNORE_IRRELEVANT_PARAMS", "0")) ) ignore_param_indexes = list() if ignore_irrelevant: @@ -936,7 +936,7 @@ class ModelAttribute: def build_fol(self): ignore_irrelevant = bool( - int(os.getenv("DFATOOL_DTREE_IGNORE_IRRELEVANT_PARAMS", "0")) + int(os.getenv("DFATOOL_RMT_IGNORE_IRRELEVANT_PARAMS", "0")) ) ignore_param_indexes = list() if ignore_irrelevant: @@ -1028,21 +1028,21 @@ class ModelAttribute: if with_function_leaves is None: with_function_leaves = bool( - int(os.getenv("DFATOOL_DTREE_FUNCTION_LEAVES", "1")) + int(os.getenv("DFATOOL_RMT_FUNCTION_LEAVES", "1")) ) if with_nonbinary_nodes is None: with_nonbinary_nodes = bool( - int(os.getenv("DFATOOL_DTREE_NONBINARY_NODES", "1")) + int(os.getenv("DFATOOL_RMT_NONBINARY_NODES", "1")) ) if with_gplearn_symreg is None: with_gplearn_symreg = bool(int(os.getenv("DFATOOL_USE_SYMREG", "0"))) if ignore_irrelevant_parameters is None: ignore_irrelevant_parameters = bool( - int(os.getenv("DFATOOL_DTREE_IGNORE_IRRELEVANT_PARAMS", "0")) + int(os.getenv("DFATOOL_RMT_IGNORE_IRRELEVANT_PARAMS", "0")) ) if loss_ignore_scalar is None: loss_ignore_scalar = bool( - int(os.getenv("DFATOOL_DTREE_LOSS_IGNORE_SCALAR", "0")) + int(os.getenv("DFATOOL_RMT_LOSS_IGNORE_SCALAR", "0")) ) if loss_ignore_scalar and not with_function_leaves: -- cgit v1.2.3