From f5100709bfe6df9e486f5bda85bd407a06c718a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sat, 15 Feb 2025 21:33:59 +0100 Subject: [PATCH] fix(qav3): properly test for previous study best_params property MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../freqaimodels/LightGBMRegressorQuickAdapterV35.py | 5 ++--- .../freqaimodels/XGBoostRegressorQuickAdapterV35.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py index 6a849bb..0718c84 100644 --- a/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/LightGBMRegressorQuickAdapterV35.py @@ -285,7 +285,7 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): direction=optuna.study.StudyDirection.MINIMIZE, storage=storage, ) - if previous_study: + if previous_study and hasattr(previous_study, "best_params"): study.enqueue_trial(previous_study.best_params) start = time.time() try: @@ -342,7 +342,7 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): direction=optuna.study.StudyDirection.MINIMIZE, storage=storage, ) - if previous_study: + if previous_study and hasattr(previous_study, "best_params"): study.enqueue_trial(previous_study.best_params) start = time.time() try: @@ -382,7 +382,6 @@ class LightGBMRegressorQuickAdapterV35(BaseRegressionModel): ) -> optuna.study.Study | None: try: previous_study = optuna.load_study(study_name=study_name, storage=storage) - previous_study.best_params except Exception: previous_study = None try: diff --git a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py index 79666e2..3493740 100644 --- a/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py +++ b/quickadapter/user_data/freqaimodels/XGBoostRegressorQuickAdapterV35.py @@ -286,7 +286,7 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): direction=optuna.study.StudyDirection.MINIMIZE, storage=storage, ) - if previous_study: + if previous_study and hasattr(previous_study, "best_params"): study.enqueue_trial(previous_study.best_params) start = time.time() try: @@ -343,7 +343,7 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): direction=optuna.study.StudyDirection.MINIMIZE, storage=storage, ) - if previous_study: + if previous_study and hasattr(previous_study, "best_params"): study.enqueue_trial(previous_study.best_params) start = time.time() try: @@ -383,7 +383,6 @@ class XGBoostRegressorQuickAdapterV35(BaseRegressionModel): ) -> optuna.study.Study | None: try: previous_study = optuna.load_study(study_name=study_name, storage=storage) - previous_study.best_params except Exception: previous_study = None try: -- 2.43.0