From f7e796e7c6135567706a6989bb950802c0c413f9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 6 May 2025 11:28:53 +0200 Subject: [PATCH] refactor(qav3): variable namespace cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../freqaimodels/QuickAdapterRegressorV3.py | 8 ++++---- quickadapter/user_data/strategies/Utils.py | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index 9291f69..8629e67 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -899,16 +899,16 @@ def zigzag( def is_reversal_confirmed(pos: int, direction: TrendDirection) -> bool: next_start = pos + 1 next_end = min(pos + confirmation_window + 1, n) - prev_start = max(pos - confirmation_window, 0) - prev_end = pos - if next_start >= next_end or prev_start >= prev_end: + previous_start = max(pos - confirmation_window, 0) + previous_end = pos + if next_start >= next_end or previous_start >= previous_end: return False next_slice = slice(next_start, next_end) next_closes = closes[next_slice] next_highs = highs[next_slice] next_lows = lows[next_slice] - previous_slice = slice(prev_start, prev_end) + previous_slice = slice(previous_start, previous_end) previous_closes = closes[previous_slice] previous_highs = highs[previous_slice] previous_lows = lows[previous_slice] diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py index 0634c62..633e4c8 100644 --- a/quickadapter/user_data/strategies/Utils.py +++ b/quickadapter/user_data/strategies/Utils.py @@ -299,7 +299,9 @@ def alligator( return jaw, teeth, lips -def find_fractals(df: pd.DataFrame, fractal_period: int) -> tuple[list[int], list[int]]: +def find_fractals( + df: pd.DataFrame, fractal_period: int = 2 +) -> tuple[list[int], list[int]]: n = len(df) if n < 2 * fractal_period + 1: return [], [] @@ -389,16 +391,16 @@ def zigzag( def is_reversal_confirmed(pos: int, direction: TrendDirection) -> bool: next_start = pos + 1 next_end = min(pos + confirmation_window + 1, n) - prev_start = max(pos - confirmation_window, 0) - prev_end = pos - if next_start >= next_end or prev_start >= prev_end: + previous_start = max(pos - confirmation_window, 0) + previous_end = pos + if next_start >= next_end or previous_start >= previous_end: return False next_slice = slice(next_start, next_end) next_closes = closes[next_slice] next_highs = highs[next_slice] next_lows = lows[next_slice] - previous_slice = slice(prev_start, prev_end) + previous_slice = slice(previous_start, previous_end) previous_closes = closes[previous_slice] previous_highs = highs[previous_slice] previous_lows = lows[previous_slice] -- 2.43.0