CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix backtesting not setting entry_tag out of position adjustments

Browse Source
This commit is contained in:
Matthias
2024-01-28 23:05:19 +01:00
parent d664e76834
commit 79b8496f38
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
freqtrade/optimize/backtesting.py
View File

@@ -554,7 +554,8 @@ class Backtesting:
check_adjust_entry = (entry_count <= self.strategy.max_entry_position_adjustment) check_adjust_entry = (entry_count <= self.strategy.max_entry_position_adjustment)
if check_adjust_entry: if check_adjust_entry:
pos_trade = self._enter_trade( pos_trade = self._enter_trade(
trade.pair, row, 'short' if trade.is_short else 'long', stake_amount, trade) trade.pair, row, 'short' if trade.is_short else 'long', stake_amount, trade,
entry_tag1=order_tag)
if pos_trade is not None: if pos_trade is not None:
self.wallets.update() self.wallets.update()
return pos_trade return pos_trade
@@ -836,7 +837,9 @@ class Backtesting:
stake_amount: Optional[float] = None, stake_amount: Optional[float] = None,
trade: Optional[LocalTrade] = None, trade: Optional[LocalTrade] = None,
requested_rate: Optional[float] = None, requested_rate: Optional[float] = None,
requested_stake: Optional[float] = None) -> Optional[LocalTrade]: requested_stake: Optional[float] = None,
entry_tag1: Optional[str] = None
) -> Optional[LocalTrade]:
""" """
:param trade: Trade to adjust - initial entry if None :param trade: Trade to adjust - initial entry if None
:param requested_rate: Adjusted entry rate :param requested_rate: Adjusted entry rate
@@ -844,7 +847,7 @@ class Backtesting:
""" """
current_time = row[DATE_IDX].to_pydatetime() current_time = row[DATE_IDX].to_pydatetime()
entry_tag = row[ENTER_TAG_IDX] if len(row) >= ENTER_TAG_IDX + 1 else None entry_tag = entry_tag1 or (row[ENTER_TAG_IDX] if len(row) >= ENTER_TAG_IDX + 1 else None)
# let's call the custom entry price, using the open price as default price # let's call the custom entry price, using the open price as default price
order_type = self.strategy.order_types['entry'] order_type = self.strategy.order_types['entry']
pos_adjust = trade is not None and requested_rate is None pos_adjust = trade is not None and requested_rate is None