CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-12-03 18:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move more logic to generator

Browse Source
This commit is contained in:
Matthias
2025-01-14 20:15:17 +01:00
parent 96cea99d4f
commit 807fcffdae
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
freqtrade/optimize/backtesting.py
View File

@@ -1485,7 +1485,11 @@ class Backtesting:
self.dataprovider._set_dataframe_max_index(self.required_startup + row_index)
self.dataprovider._set_dataframe_max_date(current_time)
yield current_time, pair, row, is_last_row
trade_dir: LongShort | None = self.check_for_trade_entry(row)
pair_has_open_trades = len(LocalTrade.bt_trades_open_pp[pair]) > 0
yield current_time, pair, row, is_last_row, trade_dir, pair_has_open_trades
self.progress.increment()
@@ -1511,12 +1515,16 @@ class Backtesting:
data: dict = self._get_ohlcv_as_lists(processed)
# Loop timerange and get candle for each pair at that point in time
for current_time, pair, row, is_last_row in self.time_pair_generator(
for (
current_time,
pair,
row,
is_last_row,
trade_dir,
pair_has_open_trades,
) in self.time_pair_generator(
start_date, end_date, self.timeframe_td, list(data.keys()), data
):
trade_dir: LongShort | None = self.check_for_trade_entry(row)
pair_has_open_trades = len(LocalTrade.bt_trades_open_pp[pair]) > 0
if (
(trade_dir is not None or pair_has_open_trades)
and self.timeframe_detail