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

Fix for merge_informative_pair fix.

Browse Source
This commit is contained in:
Mihail
2025-09-02 18:33:23 +00:00
parent a53c4a3ed1
commit 3fe721a772
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/strategy/strategy_helper.py
+8 -5
View File
@@ -95,13 +95,16 @@ def merge_informative_pair(
# If date_merge of the informative dataframe candle that is above of first date of dataframe, then first raws of # If date_merge of the informative dataframe candle that is above of first date of dataframe, then first raws of
# dataframe are filled with Nans. The code below is to fix it and fulfill first raws with an appropriate values. # dataframe are filled with Nans. The code below is to fix it and fulfill first raws with an appropriate values.
if len(dataframe) > 1 and pd.isnull(dataframe.iloc[0]["date_merge"]): if len(dataframe) > 1 and len(informative) > 0 and pd.isnull(dataframe.iloc[0][date_merge]):
first_valid_idx = dataframe["date_merge"].first_valid_index() first_valid_idx = dataframe[date_merge].first_valid_index()
first_valid_date_merge = dataframe.loc[first_valid_idx, "date_merge"] first_valid_date_merge = dataframe.loc[first_valid_idx, date_merge]
matching_informative_raws = informative[informative["date_merge"] < first_valid_date_merge] matching_informative_raws = informative[
informative[date_merge] < first_valid_date_merge
]
if not matching_informative_raws.empty: if not matching_informative_raws.empty:
dataframe.loc[: first_valid_idx - 1] = dataframe.loc[: first_valid_idx - 1].fillna( dataframe.loc[: first_valid_idx - 1] = dataframe.loc[: first_valid_idx - 1].fillna(
matching_informative_raws.iloc[-1]) 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"