From f679f5df19cea2cc100be7af1b11d44053d6ed8c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sat, 7 Jun 2025 22:10:56 +0200 Subject: [PATCH] refactor(qav3): cleanup get_trade_moving_average_natr() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- quickadapter/user_data/strategies/QuickAdapterV3.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py index 0fa4f93..43ce380 100644 --- a/quickadapter/user_data/strategies/QuickAdapterV3.py +++ b/quickadapter/user_data/strategies/QuickAdapterV3.py @@ -555,7 +555,6 @@ class QuickAdapterV3(IStrategy): label_natr = df.get("natr_label_period_candles") if label_natr is None or label_natr.empty: return None - trade_moving_average_natr = np.nan if trade_duration_candles >= 2: zl_kama = get_zl_ma_fn("kama") try: @@ -566,16 +565,12 @@ class QuickAdapterV3(IStrategy): ~np.isnan(trade_kama_natr_values) ] if trade_kama_natr_values.size > 0: - trade_moving_average_natr = trade_kama_natr_values[-1] + return trade_kama_natr_values[-1] except Exception as e: logger.error( f"Failed to calculate KAMA for pair {pair}: {str(e)}", exc_info=True ) - if isna(trade_moving_average_natr): - trade_moving_average_natr = zlema( - label_natr, period=trade_duration_candles - ).iloc[-1] - return trade_moving_average_natr + return zlema(label_natr, period=trade_duration_candles).iloc[-1] def get_trade_natr( self, df: DataFrame, trade: Trade, trade_duration_candles: int -- 2.43.0