mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

partial exit order should not close immediately

Browse Source 
closes #10166
This commit is contained in:
Matthias
2024-05-04 08:39:13 +02:00
parent 19edee9123
commit 62a3ed6f8d
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/optimize/backtesting.py
+12 -16
View File
@@ -587,10 +587,6 @@ class Backtesting:
exit_ = ExitCheckTuple(ExitType.PARTIAL_EXIT, order_tag) exit_ = ExitCheckTuple(ExitType.PARTIAL_EXIT, order_tag)
pos_trade = self._get_exit_for_signal(trade, row, exit_, current_time, amount) pos_trade = self._get_exit_for_signal(trade, row, exit_, current_time, amount)
if pos_trade is not None: if pos_trade is not None:
order = pos_trade.orders[-1]
if self._try_close_open_order(order, trade, current_time, row):
trade.recalc_trade_from_orders()
self.wallets.update()
return pos_trade return pos_trade
return trade return trade
@@ -748,18 +744,18 @@ class Backtesting:
if self.strategy.position_adjustment_enable: if self.strategy.position_adjustment_enable:
trade = self._get_adjust_trade_entry_for_candle(trade, row, current_time) trade = self._get_adjust_trade_entry_for_candle(trade, row, current_time)
enter = row[SHORT_IDX] if trade.is_short else row[LONG_IDX] if not trade.has_open_orders:
exit_sig = row[ESHORT_IDX] if trade.is_short else row[ELONG_IDX] enter = row[SHORT_IDX] if trade.is_short else row[LONG_IDX]
exits = self.strategy.should_exit( exit_sig = row[ESHORT_IDX] if trade.is_short else row[ELONG_IDX]
trade, row[OPEN_IDX], row[DATE_IDX].to_pydatetime(), # type: ignore exits = self.strategy.should_exit(
enter=enter, exit_=exit_sig, trade, row[OPEN_IDX], row[DATE_IDX].to_pydatetime(), # type: ignore
low=row[LOW_IDX], high=row[HIGH_IDX] enter=enter, exit_=exit_sig,
) low=row[LOW_IDX], high=row[HIGH_IDX]
for exit_ in exits: )
t = self._get_exit_for_signal(trade, row, exit_, current_time) for exit_ in exits:
if t: t = self._get_exit_for_signal(trade, row, exit_, current_time)
return t if t:
return None return t
def _run_funding_fees(self, trade: LocalTrade, current_time: datetime, force: bool = False): def _run_funding_fees(self, trade: LocalTrade, current_time: datetime, force: bool = False):
""" """