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

simplify merging logic

Browse Source
This commit is contained in:
jainanuj94
2024-08-18 23:22:20 +05:30
parent c3679910a4
commit b6702d1d32
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
freqtrade/data/entryexitanalysis.py
View File

@@ -302,16 +302,16 @@ def print_results(
def _merge_dfs(entry_df, exit_df, available_inds): def _merge_dfs(entry_df, exit_df, available_inds):
merge_on = ["pair", "open_date"] merge_on = ["pair", "open_date"]
columns_to_keep = merge_on + ["enter_reason", "exit_reason"] + available_inds columns_to_keep = merge_on + ["enter_reason", "exit_reason"] + available_inds
if exit_df is not None and not exit_df.empty:
merged_df = pd.merge( if exit_df is None or exit_df.empty:
entry_df[columns_to_keep], return entry_df[columns_to_keep]
exit_df[merge_on + available_inds],
on=merge_on, return pd.merge(
suffixes=(" (entry)", " (exit)"), entry_df[columns_to_keep],
) exit_df[merge_on + available_inds],
else: on=merge_on,
merged_df = entry_df[columns_to_keep] suffixes=(" (entry)", " (exit)"),
return merged_df )
def _print_table( def _print_table(