From c217f44fa50b8c1fa7e74942f4da8f273603c113 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Tue, 18 Mar 2025 21:40:35 +0100 Subject: [PATCH] refactor(qav3): cleanups 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quickadapter/user_data/strategies/QuickAdapterV3.py b/quickadapter/user_data/strategies/QuickAdapterV3.py index c9c00b9..90f3f3b 100644 --- a/quickadapter/user_data/strategies/QuickAdapterV3.py +++ b/quickadapter/user_data/strategies/QuickAdapterV3.py @@ -390,7 +390,7 @@ class QuickAdapterV3(IStrategy): def get_trade_entries( self, df: DataFrame, trade: Trade - ) -> tuple[datetime.datetime, float | None, DataFrame | None]: + ) -> tuple[datetime.datetime, float | None]: entry_date = timeframe_to_prev_date(self.timeframe, trade.open_date_utc) entry_candle = df.loc[(df["date"] == entry_date)] @@ -407,7 +407,7 @@ class QuickAdapterV3(IStrategy): entry_natr = entry_candle["natr_ratio_labeling_window"] trade.metadata["entry_natr"] = entry_natr - return entry_date, entry_natr, entry_candle + return entry_date, entry_natr def get_stoploss_distance(self, trade: Trade, natr: float) -> float: return trade.open_rate * natr * self.stoploss_natr_ratio @@ -430,8 +430,8 @@ class QuickAdapterV3(IStrategy): if df.empty: return None - entry_date, entry_natr, entry_candle = self.get_trade_entries(df, trade) - if entry_natr is None or entry_candle is None: + entry_date, entry_natr = self.get_trade_entries(df, trade) + if entry_natr is None: return None entry_stoploss_distance = self.get_stoploss_distance(trade, entry_natr) last_natr = df["natr_ratio_labeling_window"].iloc[-1] @@ -486,7 +486,7 @@ class QuickAdapterV3(IStrategy): ): return "maxima_detected_long" - _, entry_natr, _ = self.get_trade_entries(df, trade) + _, entry_natr = self.get_trade_entries(df, trade) if entry_natr is None: return None last_natr = df["natr_ratio_labeling_window"].iloc[-1] -- 2.43.0