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

use BT_DATA_COLUMNS for trade wide indicators

Browse Source
This commit is contained in:
Anuj Jain
2024-09-06 12:28:02 +05:30
parent b7145debfb
commit 8d96844312
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/data/entryexitanalysis.py
View File

@@ -8,6 +8,7 @@ import pandas as pd
from freqtrade.configuration import TimeRange
from freqtrade.constants import Config
from freqtrade.data.btanalysis import (
BT_DATA_COLUMNS,
get_latest_backtest_filename,
load_backtest_data,
load_backtest_stats,
@@ -303,15 +304,7 @@ def print_results(
def _merge_dfs(entry_df, exit_df, available_inds):
merge_on = ["pair", "open_date"]
trade_wide_indicators = [
"open_date",
"close_date",
"min_rate",
"max_rate",
"profit_ratio",
"profit_abs",
]
signal_wide_indicators = list(set(available_inds) - set(trade_wide_indicators))
signal_wide_indicators = list(set(available_inds) - set(BT_DATA_COLUMNS))
columns_to_keep = merge_on + ["enter_reason", "exit_reason"] + available_inds
if exit_df is None or exit_df.empty: