refactor(qav3): reorder extrema plotting

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 431238a1e514906c27d8c53104720a6675772a5f..12519a5a9c4a31b14e191ab29ca9d87d79065147 100644 (file)
--- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
+++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
@@ -25,8 +25,8 @@ debug = False
 TEST_SIZE = 0.1
 
 EXTREMA_COLUMN = "&s-extrema"
-MINIMA_THRESHOLD_COLUMN = "&s-minima_threshold"
 MAXIMA_THRESHOLD_COLUMN = "&s-maxima_threshold"
+MINIMA_THRESHOLD_COLUMN = "&s-minima_threshold"
 
 warnings.simplefilter(action="ignore", category=FutureWarning)
 
@@ -518,7 +518,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel):
         label_period_candles: int,
     ) -> tuple[float, float]:
         temperature = float(
-            self.freqai_info.get("prediction_thresholds_temperature", 250.0)
+            self.freqai_info.get("prediction_thresholds_temperature", 280.0)
         )
         extrema = pred_df.get(EXTREMA_COLUMN).iloc[
             -(

diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py
index 5220abb6b73b30306c84b4daa9e2e86bfdec2c45..e965da99456b9d2ab41a1e6a1d2ec5d55c427d06 100644 (file)
--- a/quickadapter/user_data/strategies/QuickAdapterV3.py
+++ b/quickadapter/user_data/strategies/QuickAdapterV3.py
@@ -41,8 +41,8 @@ debug = False
 logger = logging.getLogger(__name__)
 
 EXTREMA_COLUMN = "&s-extrema"
-MINIMA_THRESHOLD_COLUMN = "&s-minima_threshold"
 MAXIMA_THRESHOLD_COLUMN = "&s-maxima_threshold"
+MINIMA_THRESHOLD_COLUMN = "&s-minima_threshold"
 
 
 class QuickAdapterV3(IStrategy):
@@ -109,9 +109,9 @@ class QuickAdapterV3(IStrategy):
                     "train_rmse": {"color": "#a3087a", "type": "line"},
                 },
                 "extrema": {
+                    MAXIMA_THRESHOLD_COLUMN: {"color": "#e6be0b", "type": "line"},
                     EXTREMA_COLUMN: {"color": "#f53580", "type": "line"},
                     MINIMA_THRESHOLD_COLUMN: {"color": "#4ae747", "type": "line"},
-                    MAXIMA_THRESHOLD_COLUMN: {"color": "#e6be0b", "type": "line"},
                 },
                 "min_max": {
                     "maxima": {"color": "#0dd6de", "type": "bar"},