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

fix: handle case where informative does not overlap with the main data

Browse Source
This commit is contained in:
Matthias
2025-10-12 09:51:31 +02:00
parent 876875cff2
commit 93b87696c6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/strategy/strategy_helper.py
View File

@@ -98,14 +98,15 @@ def merge_informative_pair(
# We can fill these with the last available informative candle before the start date # We can fill these with the last available informative candle before the start date
# while still avoiding lookahead bias - as only past data is used. # while still avoiding lookahead bias - as only past data is used.
first_valid_idx = dataframe[date_merge].first_valid_index() first_valid_idx = dataframe[date_merge].first_valid_index()
first_valid_date_merge = dataframe.at[first_valid_idx, date_merge] if first_valid_idx:
matching_informative_raws = informative[ first_valid_date_merge = dataframe.at[first_valid_idx, date_merge]
informative[date_merge] < first_valid_date_merge matching_informative_raws = informative[
] informative[date_merge] < first_valid_date_merge
if not matching_informative_raws.empty: ]
dataframe.loc[: first_valid_idx - 1] = dataframe.loc[: first_valid_idx - 1].fillna( if not matching_informative_raws.empty:
matching_informative_raws.iloc[-1] dataframe.loc[: first_valid_idx - 1] = dataframe.loc[
) : first_valid_idx - 1
].fillna(matching_informative_raws.iloc[-1])
else: else:
dataframe = pd.merge( dataframe = pd.merge(
dataframe, informative, left_on="date", right_on=date_merge, how="left" dataframe, informative, left_on="date", right_on=date_merge, how="left"