From cfee187b3d47a971859a59609f974ac1be89cf09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 18 May 2025 15:58:20 +0200 Subject: [PATCH] refactor(qa3v): trivial code cleanups 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 | 7 +++---- quickadapter/user_data/strategies/Utils.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index 6511d1d..f273230 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -890,13 +890,12 @@ def zigzag( min_factor: float = 0.5, max_factor: float = 1.5, ) -> float: - natr_values = get_natr_values(natr_period) - start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return (min_factor + max_factor) / 2 + natr_values = get_natr_values(natr_period) natr_pos = natr_values[pos] lookback_natr = natr_values[start:end] median_natr = np.median(lookback_natr) @@ -937,12 +936,12 @@ def zigzag( min_value: float = 0.3, max_value: float = 0.7, ) -> float: - natr_values = get_natr_values(natr_period) - start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return min_value + + natr_values = get_natr_values(natr_period) natr_pos = natr_values[pos] lookback_natr = natr_values[start:end] natr_min = np.min(lookback_natr) diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py index 236055b..8c9e61e 100644 --- a/quickadapter/user_data/strategies/Utils.py +++ b/quickadapter/user_data/strategies/Utils.py @@ -387,13 +387,12 @@ def zigzag( min_factor: float = 0.5, max_factor: float = 1.5, ) -> float: - natr_values = get_natr_values(natr_period) - start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return (min_factor + max_factor) / 2 + natr_values = get_natr_values(natr_period) natr_pos = natr_values[pos] lookback_natr = natr_values[start:end] median_natr = np.median(lookback_natr) @@ -434,12 +433,12 @@ def zigzag( min_value: float = 0.3, max_value: float = 0.7, ) -> float: - natr_values = get_natr_values(natr_period) - start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return min_value + + natr_values = get_natr_values(natr_period) natr_pos = natr_values[pos] lookback_natr = natr_values[start:end] natr_min = np.min(lookback_natr) -- 2.43.0