refactor(qav3): code cleanups

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 1c8cdbf6afead9f22daf5ae2a0ae1dd8863dd0cf..427c126a2f50c80b6dbeeccf89a2de408f0d9682 100644 (file)
--- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
+++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
@@ -303,7 +303,7 @@ class QuickAdapterRegressorV3(BaseRegressionModel):
             self._optuna_label_candles[pair] = 0
 
         self.regressor: Regressor = self.freqai_info.get("regressor", REGRESSORS[0])
-        if self.regressor not in REGRESSORS:
+        if self.regressor not in set(REGRESSORS):
             self.regressor = REGRESSORS[0]
             self.freqai_info["regressor"] = self.regressor
         logger.info(

diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py
index 34bd96e9d0356d2e6843e0a3e7f8b6f115fd8aa3..d727698985ddb7873e74668708c5ced245a14880 100644 (file)
--- a/quickadapter/user_data/strategies/Utils.py
+++ b/quickadapter/user_data/strategies/Utils.py
@@ -980,11 +980,11 @@ def zigzag(
         pivots_values.append(value)
         pivots_directions.append(direction)
         if len(pivots_values) > 1:
-            prev_value = pivots_values[-2]
-            if np.isclose(prev_value, 0.0):
+            prev_pivot_value = pivots_values[-2]
+            if np.isclose(prev_pivot_value, 0.0):
                 amplitude = np.nan
             else:
-                amplitude = abs(value - prev_value) / abs(prev_value)
+                amplitude = abs(value - prev_pivot_value) / abs(prev_pivot_value)
             current_threshold = thresholds[pos]
             if (
                 np.isfinite(current_threshold)