adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation

Browse Source
This commit is contained in:
Matthias 2022-04-23 10:51:24 +02:00
parent ba305e93ed
commit 84f5a4d5bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/strategy/strategy_helper.py
View File

@ -60,10 +60,10 @@ def merge_informative_pair(dataframe: pd.DataFrame, informative: pd.DataFrame,
# https://pandas.pydata.org/docs/user_guide/merging.html#timeseries-friendly-merging # https://pandas.pydata.org/docs/user_guide/merging.html#timeseries-friendly-merging
# merge_ordered - ffill method is 2.5x faster than seperate ffill() # merge_ordered - ffill method is 2.5x faster than seperate ffill()
dataframe = pd.merge_ordered(dataframe, informative, fill_method="ffill", left_on='date', dataframe = pd.merge_ordered(dataframe, informative, fill_method="ffill", left_on='date',
right_on=date_merge, how='left') right_on=date_merge, how='left')
else: else:
dataframe = pd.merge(dataframe, informative, left_on='date', dataframe = pd.merge(dataframe, informative, left_on='date',
right_on=date_merge, how='left') right_on=date_merge, how='left')
dataframe = dataframe.drop(date_merge, axis=1) dataframe = dataframe.drop(date_merge, axis=1)
# if ffill: # if ffill: