refactor(qav3): trivial 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 02f33040b269e431c403789399242b2f30d4828b..6511d1d7eea76cc4b85a730ce15ef10b066c502f 100644 (file)
--- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
+++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
@@ -897,8 +897,8 @@ def zigzag(
         if start >= end:
             return (min_factor + max_factor) / 2
 
-        lookback_natr = natr_values[start:end]
         natr_pos = natr_values[pos]
+        lookback_natr = natr_values[start:end]
         median_natr = np.median(lookback_natr)
         if median_natr == 0:
             median_natr = np.finfo(float).eps
@@ -938,14 +938,15 @@ def zigzag(
         max_value: float = 0.7,
     ) -> float:
         natr_values = get_natr_values(natr_period)
-        natr_pos = natr_values[pos]
 
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return min_value
-        natr_min = np.min(natr_values[start:end])
-        natr_max = np.max(natr_values[start:end])
+        natr_pos = natr_values[pos]
+        lookback_natr = natr_values[start:end]
+        natr_min = np.min(lookback_natr)
+        natr_max = np.max(lookback_natr)
         natr_range = natr_max - natr_min
         if natr_range == 0:
             natr_range = np.finfo(float).eps

diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py
index e43c323fc0b0df280567d15f9fb74ea7d1905f99..236055b088250cc15bd09d4fa55d12abda91d368 100644 (file)
--- a/quickadapter/user_data/strategies/Utils.py
+++ b/quickadapter/user_data/strategies/Utils.py
@@ -394,8 +394,8 @@ def zigzag(
         if start >= end:
             return (min_factor + max_factor) / 2
 
-        lookback_natr = natr_values[start:end]
         natr_pos = natr_values[pos]
+        lookback_natr = natr_values[start:end]
         median_natr = np.median(lookback_natr)
         if median_natr == 0:
             median_natr = np.finfo(float).eps
@@ -435,14 +435,15 @@ def zigzag(
         max_value: float = 0.7,
     ) -> float:
         natr_values = get_natr_values(natr_period)
-        natr_pos = natr_values[pos]
 
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return min_value
-        natr_min = np.min(natr_values[start:end])
-        natr_max = np.max(natr_values[start:end])
+        natr_pos = natr_values[pos]
+        lookback_natr = natr_values[start:end]
+        natr_min = np.min(lookback_natr)
+        natr_max = np.max(lookback_natr)
         natr_range = natr_max - natr_min
         if natr_range == 0:
             natr_range = np.finfo(float).eps