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

Small refactor for new methods

Browse Source
This commit is contained in:
Matthias
2023-03-19 14:56:41 +01:00
parent 3adb3d9b1e
commit af6fc886f6
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
freqtrade/optimize/backtesting.py
View File

@@ -29,8 +29,7 @@ from freqtrade.mixins import LoggingMixin
from freqtrade.optimize.backtest_caching import get_strategy_run_id
from freqtrade.optimize.bt_progress import BTProgress
from freqtrade.optimize.optimize_reports import (generate_backtest_stats, show_backtest_results,
store_backtest_rejected_signals,
store_backtest_signal_candles,
store_backtest_analysis_results,
store_backtest_stats)
from freqtrade.persistence import LocalTrade, Order, PairLocks, Trade
from freqtrade.plugins.pairlistmanager import PairListManager
@@ -1389,11 +1388,9 @@ class Backtesting:
if (self.config.get('export', 'none') == 'signals' and
self.dataprovider.runmode == RunMode.BACKTEST):
store_backtest_signal_candles(
self.config['exportfilename'], self.processed_dfs, dt_appendix)
store_backtest_rejected_signals(
self.config['exportfilename'], self.rejected_df, dt_appendix)
store_backtest_analysis_results(
self.config['exportfilename'], self.processed_dfs, self.rejected_df,
dt_appendix)
# Results may be mixed up now. Sort them so they follow --strategy-list order.
if 'strategy_list' in self.config and len(self.results) > 0:

13
freqtrade/optimize/optimize_reports.py
View File

@@ -70,14 +70,11 @@ def _store_backtest_analysis_data(
return filename
def store_backtest_signal_candles(
recordfilename: Path, candles: Dict[str, Dict], dtappendix: str) -> Path:
return _store_backtest_analysis_data(Path(recordfilename), candles, dtappendix, "signals")
def store_backtest_rejected_signals(
recordfilename: Path, trades: Dict[str, Dict], dtappendix: str) -> Path:
return _store_backtest_analysis_data(Path(recordfilename), trades, dtappendix, "rejected")
def store_backtest_analysis_results(
recordfilename: Path, candles: Dict[str, Dict], trades: Dict[str, Dict],
dtappendix: str) -> Path:
_store_backtest_analysis_data(Path(recordfilename), candles, dtappendix, "signals")
_store_backtest_analysis_data(Path(recordfilename), trades, dtappendix, "rejected")
def _get_line_floatfmt(stake_currency: str) -> List[str]: