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

add ft_order_tag to backtesting

Browse Source
This commit is contained in:
Matthias
2024-01-28 19:56:30 +01:00
parent 39ffee381b
commit e8288a34c9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/optimize/backtesting.py
View File

@@ -681,11 +681,11 @@ class Backtesting:
trade.exit_reason = exit_reason trade.exit_reason = exit_reason
return self._exit_trade(trade, row, close_rate, amount_) return self._exit_trade(trade, row, close_rate, amount_, exit_reason)
return None return None
def _exit_trade(self, trade: LocalTrade, sell_row: Tuple, def _exit_trade(self, trade: LocalTrade, sell_row: Tuple, close_rate: float,
close_rate: float, amount: float) -> Optional[LocalTrade]: amount: float, exit_reason: Optional[str]) -> Optional[LocalTrade]:
self.order_id_counter += 1 self.order_id_counter += 1
exit_candle_time = sell_row[DATE_IDX].to_pydatetime() exit_candle_time = sell_row[DATE_IDX].to_pydatetime()
order_type = self.strategy.order_types['exit'] order_type = self.strategy.order_types['exit']
@@ -712,6 +712,7 @@ class Backtesting:
filled=0, filled=0,
remaining=amount, remaining=amount,
cost=amount * close_rate, cost=amount * close_rate,
ft_order_tag=exit_reason,
) )
order._trade_bt = trade order._trade_bt = trade
trade.orders.append(order) trade.orders.append(order)
@@ -944,6 +945,7 @@ class Backtesting:
filled=0, filled=0,
remaining=amount, remaining=amount,
cost=amount * propose_rate + trade.fee_open, cost=amount * propose_rate + trade.fee_open,
ft_order_tag=entry_tag,
) )
order._trade_bt = trade order._trade_bt = trade
trade.orders.append(order) trade.orders.append(order)
@@ -963,7 +965,8 @@ class Backtesting:
# Ignore trade if entry-order did not fill yet # Ignore trade if entry-order did not fill yet
continue continue
exit_row = data[pair][-1] exit_row = data[pair][-1]
self._exit_trade(trade, exit_row, exit_row[OPEN_IDX], trade.amount) self._exit_trade(trade, exit_row, exit_row[OPEN_IDX], trade.amount,
ExitType.FORCE_EXIT.value)
trade.orders[-1].close_bt_order(exit_row[DATE_IDX].to_pydatetime(), trade) trade.orders[-1].close_bt_order(exit_row[DATE_IDX].to_pydatetime(), trade)
trade.close_date = exit_row[DATE_IDX].to_pydatetime() trade.close_date = exit_row[DATE_IDX].to_pydatetime()