From d253d36d116076738bb6e36d580e1b6d9336a142 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Thu, 5 Jun 2025 23:15:53 +0200 Subject: [PATCH] fix(qav3): relax initial pivot identification to avoid labeling failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../freqaimodels/QuickAdapterRegressorV3.py | 28 ++++++------------- .../user_data/strategies/QuickAdapterV3.py | 2 +- quickadapter/user_data/strategies/Utils.py | 26 ++++++----------- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py index c0eb21a..930b889 100644 --- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py +++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py @@ -46,7 +46,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel): https://github.com/sponsors/robcaulk """ - version = "3.7.76" + version = "3.7.77" @cached_property def _optuna_config(self) -> dict: @@ -1340,29 +1340,19 @@ def zigzag( ) if is_initial_high_move_significant and is_initial_low_move_significant: if initial_move_from_high > initial_move_from_low: - if is_reversal_confirmed( - initial_high_pos, initial_high_pos, TrendDirection.DOWN - ): - add_pivot(initial_high_pos, initial_high, TrendDirection.UP) - state = TrendDirection.DOWN - break + add_pivot(initial_high_pos, initial_high, TrendDirection.UP) + state = TrendDirection.DOWN + break else: - if is_reversal_confirmed( - initial_low_pos, initial_low_pos, TrendDirection.UP - ): - add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) - state = TrendDirection.UP - break + add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) + state = TrendDirection.UP + break else: - if is_initial_high_move_significant and is_reversal_confirmed( - initial_high_pos, initial_high_pos, TrendDirection.DOWN - ): + if is_initial_high_move_significant: add_pivot(initial_high_pos, initial_high, TrendDirection.UP) state = TrendDirection.DOWN break - elif is_initial_low_move_significant and is_reversal_confirmed( - initial_low_pos, initial_low_pos, TrendDirection.UP - ): + elif is_initial_low_move_significant: add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) state = TrendDirection.UP break diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py index ed84b1f..6ee8859 100644 --- a/quickadapter/user_data/strategies/QuickAdapterV3.py +++ b/quickadapter/user_data/strategies/QuickAdapterV3.py @@ -61,7 +61,7 @@ class QuickAdapterV3(IStrategy): INTERFACE_VERSION = 3 def version(self) -> str: - return "3.3.80" + return "3.3.81" timeframe = "5m" diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py index 943adf0..cee1b45 100644 --- a/quickadapter/user_data/strategies/Utils.py +++ b/quickadapter/user_data/strategies/Utils.py @@ -606,29 +606,19 @@ def zigzag( ) if is_initial_high_move_significant and is_initial_low_move_significant: if initial_move_from_high > initial_move_from_low: - if is_reversal_confirmed( - initial_high_pos, initial_high_pos, TrendDirection.DOWN - ): - add_pivot(initial_high_pos, initial_high, TrendDirection.UP) - state = TrendDirection.DOWN - break + add_pivot(initial_high_pos, initial_high, TrendDirection.UP) + state = TrendDirection.DOWN + break else: - if is_reversal_confirmed( - initial_low_pos, initial_low_pos, TrendDirection.UP - ): - add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) - state = TrendDirection.UP - break + add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) + state = TrendDirection.UP + break else: - if is_initial_high_move_significant and is_reversal_confirmed( - initial_high_pos, initial_high_pos, TrendDirection.DOWN - ): + if is_initial_high_move_significant: add_pivot(initial_high_pos, initial_high, TrendDirection.UP) state = TrendDirection.DOWN break - elif is_initial_low_move_significant and is_reversal_confirmed( - initial_low_pos, initial_low_pos, TrendDirection.UP - ): + elif is_initial_low_move_significant: add_pivot(initial_low_pos, initial_low, TrendDirection.DOWN) state = TrendDirection.UP break -- 2.43.0