From 76ae539e619f1b8100f6392abcdb8edd5dafa4cb Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 28 Apr 2023 14:55:17 +0200 Subject: [PATCH] Minor edit --- docs/advanced-backtesting.md | 1 + freqtrade/data/entryexitanalysis.py | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/advanced-backtesting.md b/docs/advanced-backtesting.md index 4c81fd5ff..b587c4157 100644 --- a/docs/advanced-backtesting.md +++ b/docs/advanced-backtesting.md @@ -141,6 +141,7 @@ freqtrade backtesting-analysis -c --analysis-to-csv --rejected-sig ``` This will write to `user_data/backtest_results`: + * rejected_signals.csv * group_0.csv * group_1.csv diff --git a/freqtrade/data/entryexitanalysis.py b/freqtrade/data/entryexitanalysis.py index 2c198c1d4..f7344447d 100644 --- a/freqtrade/data/entryexitanalysis.py +++ b/freqtrade/data/entryexitanalysis.py @@ -1,5 +1,6 @@ import logging from pathlib import Path +from typing import Optional import joblib import pandas as pd @@ -52,9 +53,7 @@ def _process_candles_and_indicators(pairlist, strategy_name, trades, signal_cand for pair in pairlist: if pair in signal_candles[strategy_name]: analysed_trades_dict[strategy_name][pair] = _analyze_candles_and_indicators( - pair, - trades, - signal_candles[strategy_name][pair]) + pair, trades, signal_candles[strategy_name][pair]) except Exception as e: print(f"Cannot process entry/exit reasons for {strategy_name}: ", e) @@ -214,8 +213,8 @@ def prepare_results(analysed_trades, stratname, return res_df -def print_results(res_df, analysis_groups, indicator_list, - rejected_signals=None, to_csv=False, csv_path=None): +def print_results(res_df: pd.DataFrame, analysis_groups, indicator_list, + rejected_signals=None, to_csv=False, csv_path: Optional[Path] = None): if res_df.shape[0] > 0: if analysis_groups: _do_group_table_output(res_df, analysis_groups, to_csv=to_csv, csv_path=csv_path) @@ -246,7 +245,7 @@ def print_results(res_df, analysis_groups, indicator_list, print("\\No trades to show") -def _print_table(df, sortcols=None, show_index=False, name=None, to_csv=False, csv_path=None): +def _print_table(df: pd.DataFrame, sortcols=None, show_index=False, name=None, to_csv=False, csv_path=None): if (sortcols is not None): data = df.sort_values(sortcols) else: