refactor(qa3v): 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 6511d1d7eea76cc4b85a730ce15ef10b066c502f..f2732306c3245db68f898a5da9bdccaa44c13468 100644 (file)
--- a/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
+++ b/quickadapter/user_data/freqaimodels/QuickAdapterRegressorV3.py
@@ -890,13 +890,12 @@ def zigzag(
         min_factor: float = 0.5,
         max_factor: float = 1.5,
     ) -> float:
-        natr_values = get_natr_values(natr_period)
-
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return (min_factor + max_factor) / 2
 
+        natr_values = get_natr_values(natr_period)
         natr_pos = natr_values[pos]
         lookback_natr = natr_values[start:end]
         median_natr = np.median(lookback_natr)
@@ -937,12 +936,12 @@ def zigzag(
         min_value: float = 0.3,
         max_value: float = 0.7,
     ) -> float:
-        natr_values = get_natr_values(natr_period)
-
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return min_value
+
+        natr_values = get_natr_values(natr_period)
         natr_pos = natr_values[pos]
         lookback_natr = natr_values[start:end]
         natr_min = np.min(lookback_natr)

diff --git a/quickadapter/user_data/strategies/Utils.py b/quickadapter/user_data/strategies/Utils.py
index 236055b088250cc15bd09d4fa55d12abda91d368..8c9e61e66fcacf6aa56c0268068dafff5e57cd69 100644 (file)
--- a/quickadapter/user_data/strategies/Utils.py
+++ b/quickadapter/user_data/strategies/Utils.py
@@ -387,13 +387,12 @@ def zigzag(
         min_factor: float = 0.5,
         max_factor: float = 1.5,
     ) -> float:
-        natr_values = get_natr_values(natr_period)
-
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return (min_factor + max_factor) / 2
 
+        natr_values = get_natr_values(natr_period)
         natr_pos = natr_values[pos]
         lookback_natr = natr_values[start:end]
         median_natr = np.median(lookback_natr)
@@ -434,12 +433,12 @@ def zigzag(
         min_value: float = 0.3,
         max_value: float = 0.7,
     ) -> float:
-        natr_values = get_natr_values(natr_period)
-
         start = max(0, pos - lookback_period)
         end = min(pos + 1, n)
         if start >= end:
             return min_value
+
+        natr_values = get_natr_values(natr_period)
         natr_pos = natr_values[pos]
         lookback_natr = natr_values[start:end]
         natr_min = np.min(lookback_natr)