fix(qav3): relax initial pivot identification to avoid labeling failure

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
index c0eb21a9c122f3bf09e6d757903271be151d6ac4..930b88963706b0c399ce87fbb99d01f4f325c5a9 100644 (file)
--- 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 ed84b1f57731cef871c0d74f86731ea1f2a6a89b..6ee8859972bae8dd596a9b9f560ac43f54662432 100644 (file)
--- 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 943adf0d8c7891ec8b09162eab98e18daf858df5..cee1b45fbc903aad706817ae42c78915c7821db6 100644 (file)
--- 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