From f1f2860d78401f5617b9cb9fbe01b5c90609041d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 22 Jun 2025 19:09:02 +0200 Subject: [PATCH] refactor(qav3): simplify candle pool caching MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../user_data/freqaimodels/QuickAdapterRegressorV3.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index c5d91ca..8e9b6b2 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -84,10 +84,11 @@ class QuickAdapterRegressorV3(BaseRegressionModel): label_frequency_candles = max( 2, 2 * n_pairs, int(self.ft_params.get("label_frequency_candles", 12)) ) - cache_key = (n_pairs, label_frequency_candles) + cache_key = label_frequency_candles if cache_key not in self._optuna_label_candle_pool_full_cache: - min_offset = -int(label_frequency_candles / 2) - max_offset = int(label_frequency_candles / 2) + half_label_frequency_candles = int(label_frequency_candles / 2) + min_offset = -half_label_frequency_candles + max_offset = half_label_frequency_candles self._optuna_label_candle_pool_full_cache[cache_key] = [ max(1, label_frequency_candles + offset) for offset in range(min_offset, max_offset + 1) @@ -119,7 +120,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel): self._optuna_hp_params: dict[str, dict[str, Any]] = {} self._optuna_train_params: dict[str, dict[str, Any]] = {} self._optuna_label_params: dict[str, dict[str, Any]] = {} - self._optuna_label_candle_pool_full_cache: dict[tuple[int, int], list[int]] = {} + self._optuna_label_candle_pool_full_cache: dict[int, list[int]] = {} self.init_optuna_label_candle_pool() self._optuna_label_candle: dict[str, int] = {} self._optuna_label_candles: dict[str, int] = {} -- 2.43.0