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

refactor: simplify backtesting class

Browse Source
This commit is contained in:
Matthias
2025-01-17 19:18:28 +01:00
parent f7f78ad2a4
commit e350dbd552
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
freqtrade/optimize/backtesting.py
View File

@@ -1335,28 +1335,6 @@ class Backtesting:
current_time: datetime, current_time: datetime,
trade_dir: LongShort | None, trade_dir: LongShort | None,
can_enter: bool, can_enter: bool,
) -> None:
"""
Conditionally call backtest_loop_inner a 2nd time if shorting is enabled,
a position closed and a new signal in the other direction is available.
"""
if not self._can_short or trade_dir is None:
# No need to reverse position if shorting is disabled or there's no new signal
self.backtest_loop_inner(row, pair, current_time, trade_dir, can_enter)
else:
for _ in (0, 1):
a = self.backtest_loop_inner(row, pair, current_time, trade_dir, can_enter)
if not a or a == trade_dir:
# the trade didn't close or position change is in the same direction
break
def backtest_loop_inner(
self,
row: tuple,
pair: str,
current_time: datetime,
trade_dir: LongShort | None,
can_enter: bool,
) -> LongShort | None: ) -> LongShort | None:
""" """
NOTE: This method is used by Hyperopt at each iteration. Please keep it optimized. NOTE: This method is used by Hyperopt at each iteration. Please keep it optimized.
@@ -1598,7 +1576,18 @@ class Backtesting:
is_last_row, is_last_row,
trade_dir, trade_dir,
) in self.time_pair_generator(start_date, end_date, list(data.keys()), data): ) in self.time_pair_generator(start_date, end_date, list(data.keys()), data):
if not self._can_short or trade_dir is None:
# No need to reverse position if shorting is disabled or there's no new signal
self.backtest_loop(row, pair, current_time, trade_dir, not is_last_row) self.backtest_loop(row, pair, current_time, trade_dir, not is_last_row)
else:
# Conditionally call backtest_loop a 2nd time if shorting is enabled,
# a position closed and a new signal in the other direction is available.
for _ in (0, 1):
a = self.backtest_loop(row, pair, current_time, trade_dir, not is_last_row)
if not a or a == trade_dir:
# the trade didn't close or position change is in the same direction
break
self.handle_left_open(LocalTrade.bt_trades_open_pp, data=data) self.handle_left_open(LocalTrade.bt_trades_open_pp, data=data)
self.wallets.update() self.wallets.update()

4
tests/optimize/test_backtesting.py
View File

@@ -1907,9 +1907,9 @@ def test_backtest_multi_pair_long_short_switch(
if use_detail: if use_detail:
# Backtest loop is called once per candle per pair # Backtest loop is called once per candle per pair
assert bl_spy.call_count == 1482 assert bl_spy.call_count == 1511
else: else:
assert bl_spy.call_count == 479 assert bl_spy.call_count == 508
# Make sure we have parallel trades # Make sure we have parallel trades
assert len(evaluate_result_multi(results["results"], "5m", 0)) > 0 assert len(evaluate_result_multi(results["results"], "5m", 0)) > 0