From ac673b6731b5b6169e4f6f07ac4b3a4ffbea699e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Thu, 6 Feb 2025 13:40:55 +0100 Subject: [PATCH] refactor(qav3): refine optuna enablement condition MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py | 3 ++- .../user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py index f673601..07e7d75 100644 --- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py @@ -40,7 +40,8 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): super().__init__(**kwargs) self.__optuna_config = self.freqai_info.get("optuna_hyperopt", {}) self.__optuna_hyperopt: bool = ( - self.__optuna_config.get("enabled", False) + self.freqai_info.get("enabled", False) + and self.__optuna_config.get("enabled", False) and self.data_split_parameters.get("test_size", TEST_SIZE) > 0 ) self.__optuna_hp = {} diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py index 15abca3..fcffac6 100644 --- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py @@ -40,7 +40,8 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): super().__init__(**kwargs) self.__optuna_config = self.freqai_info.get("optuna_hyperopt", {}) self.__optuna_hyperopt: bool = ( - self.__optuna_config.get("enabled", False) + self.freqai_info.get("enabled", False) + and self.__optuna_config.get("enabled", False) and self.data_split_parameters.get("test_size", TEST_SIZE) > 0 ) self.__optuna_hp = {} -- 2.43.0