From b6702d1d322a6c22d59c0fe2c319bfe7347d306f Mon Sep 17 00:00:00 2001 From: jainanuj94 Date: Sun, 18 Aug 2024 23:22:20 +0530 Subject: [PATCH] simplify merging logic --- freqtrade/data/entryexitanalysis.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/freqtrade/data/entryexitanalysis.py b/freqtrade/data/entryexitanalysis.py index e217294a2..da5489731 100644 --- a/freqtrade/data/entryexitanalysis.py +++ b/freqtrade/data/entryexitanalysis.py @@ -302,16 +302,16 @@ def print_results( def _merge_dfs(entry_df, exit_df, available_inds): merge_on = ["pair", "open_date"] 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( - entry_df[columns_to_keep], - exit_df[merge_on + available_inds], - on=merge_on, - suffixes=(" (entry)", " (exit)"), - ) - else: - merged_df = entry_df[columns_to_keep] - return merged_df + + if exit_df is None or exit_df.empty: + return entry_df[columns_to_keep] + + return pd.merge( + entry_df[columns_to_keep], + exit_df[merge_on + available_inds], + on=merge_on, + suffixes=(" (entry)", " (exit)"), + ) def _print_table(