From 666b0f895cd2917f3357bc358453991929c85501 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 18 May 2025 15:26:48 +0200 Subject: [PATCH] refactor(qav3): 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 | 9 +++++---- quickadapter/user_data/strategies/Utils.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index 02f3304..6511d1d 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -897,8 +897,8 @@ def zigzag( if start >= end: return (min_factor + max_factor) / 2 - lookback_natr = natr_values[start:end] natr_pos = natr_values[pos] + lookback_natr = natr_values[start:end] median_natr = np.median(lookback_natr) if median_natr == 0: median_natr = np.finfo(float).eps @@ -938,14 +938,15 @@ def zigzag( max_value: float = 0.7, ) -> float: natr_values = get_natr_values(natr_period) - natr_pos = natr_values[pos] start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return min_value - natr_min = np.min(natr_values[start:end]) - natr_max = np.max(natr_values[start:end]) + natr_pos = natr_values[pos] + lookback_natr = natr_values[start:end] + natr_min = np.min(lookback_natr) + natr_max = np.max(lookback_natr) natr_range = natr_max - natr_min if natr_range == 0: natr_range = np.finfo(float).eps diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py index e43c323..236055b 100644 --- a/quickadapter/user_data/strategies/Utils.py +++ b/quickadapter/user_data/strategies/Utils.py @@ -394,8 +394,8 @@ def zigzag( if start >= end: return (min_factor + max_factor) / 2 - lookback_natr = natr_values[start:end] natr_pos = natr_values[pos] + lookback_natr = natr_values[start:end] median_natr = np.median(lookback_natr) if median_natr == 0: median_natr = np.finfo(float).eps @@ -435,14 +435,15 @@ def zigzag( max_value: float = 0.7, ) -> float: natr_values = get_natr_values(natr_period) - natr_pos = natr_values[pos] start = max(0, pos - lookback_period) end = min(pos + 1, n) if start >= end: return min_value - natr_min = np.min(natr_values[start:end]) - natr_max = np.max(natr_values[start:end]) + natr_pos = natr_values[pos] + lookback_natr = natr_values[start:end] + natr_min = np.min(lookback_natr) + natr_max = np.max(lookback_natr) natr_range = natr_max - natr_min if natr_range == 0: natr_range = np.finfo(float).eps -- 2.43.0