fix(qav3): default value for pivot labeling

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

diff --git a/quickadapter/user_data/config-template.json b/quickadapter/user_data/config-template.json
index 68a34a5ad101501a22d2fec328c2528c755192ed..ec27ab34650d35948ef4560d950dfa84fe5e6f7c 100644 (file)
--- a/quickadapter/user_data/config-template.json
+++ b/quickadapter/user_data/config-template.json
@@ -138,7 +138,7 @@
       "&s-minima_threshold": -2,
       "&s-maxima_threshold": 2,
       "label_period_candles": 24,
-      "label_natr_ratio": 8.0,
+      "label_natr_ratio": 8.5,
       "hp_rmse": -1,
       "train_rmse": -1
     },

diff --git a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
index 687865456140ed022c1d57c7bc68526dfe94eea2..c8f9872bdf578e100d64523a2931db771398cbc7 100644 (file)
--- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
+++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
@@ -159,7 +159,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel):
                         "label_period_candles", 24
                     ),
                     "label_natr_ratio": float(
-                        self.ft_params.get("label_natr_ratio", 8.0)
+                        self.ft_params.get("label_natr_ratio", 8.5)
                     ),
                 }
             )

diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py
index 87b4a91a302c626e233e34980a46144508a48a76..e50a6f50bda28f91453b3767c3502defb24c27b3 100644 (file)
--- a/quickadapter/user_data/strategies/QuickAdapterV3.py
+++ b/quickadapter/user_data/strategies/QuickAdapterV3.py
@@ -219,7 +219,7 @@ class QuickAdapterV3(IStrategy):
                     ),
                     "label_natr_ratio": float(
                         self.freqai_info["feature_parameters"].get(
-                            "label_natr_ratio", 8.0
+                            "label_natr_ratio", 8.5
                         )
                     ),
                 }
@@ -426,7 +426,7 @@ class QuickAdapterV3(IStrategy):
         if label_natr_ratio and isinstance(label_natr_ratio, float):
             return label_natr_ratio
         return float(
-            self.freqai_info["feature_parameters"].get("label_natr_ratio", 8.0)
+            self.freqai_info["feature_parameters"].get("label_natr_ratio", 8.5)
         )
 
     def set_label_natr_ratio(self, pair: str, label_natr_ratio: float) -> None:

diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py
index a73216b602164b9c84d8b04a945e2da8c8a8e68a..87eb20ac883dacc163d8587e9aa2ac81da77981e 100644 (file)
--- a/quickadapter/user_data/strategies/Utils.py
+++ b/quickadapter/user_data/strategies/Utils.py
@@ -495,7 +495,7 @@ class TrendDirection(IntEnum):
 def zigzag(
     df: pd.DataFrame,
     natr_period: int = 14,
-    natr_ratio: float = 8.0,
+    natr_ratio: float = 8.5,
 ) -> tuple[list[int], list[float], list[TrendDirection], list[float]]:
     n = len(df)
     if df.empty or n < natr_period: