From c85cd13ca1a5bdbba07659d989a3f09de9464456 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 21 Jul 2019 13:31:42 +0200 Subject: [PATCH] Change default backtest result to "backtest_results" - backtest_data is misleading --- docs/backtesting.md | 2 +- docs/bot-usage.md | 4 ++-- docs/data-analysis.md | 2 +- docs/plotting.md | 2 +- freqtrade/configuration/cli_options.py | 4 ++-- user_data/backtest_results/.gitkeep | 0 6 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 user_data/backtest_results/.gitkeep diff --git a/docs/backtesting.md b/docs/backtesting.md index 179bcee15..57f9f6296 100644 --- a/docs/backtesting.md +++ b/docs/backtesting.md @@ -237,7 +237,7 @@ All listed Strategies need to be in the same directory. freqtrade backtesting --timerange 20180401-20180410 --ticker-interval 5m --strategy-list Strategy001 Strategy002 --export trades ``` -This will save the results to `user_data/backtest_data/backtest-result-.json`, injecting the strategy-name into the target filename. +This will save the results to `user_data/backtest_results/backtest-result-.json`, injecting the strategy-name into the target filename. There will be an additional table comparing win/losses of the different strategies (identical to the "Total" row in the first table). Detailed output for all strategies one after the other will be available, so make sure to scroll up. diff --git a/docs/bot-usage.md b/docs/bot-usage.md index 8877ed010..ef28eb60c 100644 --- a/docs/bot-usage.md +++ b/docs/bot-usage.md @@ -176,8 +176,8 @@ optional arguments: --export-filename PATH Save backtest results to this filename requires --export to be set as well Example --export- - filename=user_data/backtest_data/backtest_today.json - (default: user_data/backtest_data/backtest- + filename=user_data/backtest_results/backtest_today.json + (default: user_data/backtest_results/backtest- result.json) ``` diff --git a/docs/data-analysis.md b/docs/data-analysis.md index 1940fa3e6..cda7a9a57 100644 --- a/docs/data-analysis.md +++ b/docs/data-analysis.md @@ -15,7 +15,7 @@ Freqtrade provides the `load_backtest_data()` helper function to easily load the ``` python from freqtrade.data.btanalysis import load_backtest_data -df = load_backtest_data("user_data/backtest-result.json") +df = load_backtest_data("user_data/backtest_results/backtest-result.json") # Show value-counts per pair df.groupby("pair")["sell_reason"].value_counts() diff --git a/docs/plotting.md b/docs/plotting.md index b8e041d61..acab60b23 100644 --- a/docs/plotting.md +++ b/docs/plotting.md @@ -64,7 +64,7 @@ python3 scripts/plot_dataframe.py --db-url sqlite:///tradesv3.dry_run.sqlite -p To plot trades from a backtesting result, use `--export-filename ` ``` bash -python3 scripts/plot_dataframe.py --export-filename user_data/backtest_data/backtest-result.json -p BTC/ETH +python3 scripts/plot_dataframe.py --export-filename user_data/backtest_results/backtest-result.json -p BTC/ETH ``` To plot a custom strategy the strategy should have first be backtested. diff --git a/freqtrade/configuration/cli_options.py b/freqtrade/configuration/cli_options.py index 04fde2051..4ec280d0f 100644 --- a/freqtrade/configuration/cli_options.py +++ b/freqtrade/configuration/cli_options.py @@ -146,9 +146,9 @@ AVAILABLE_CLI_OPTIONS = { '--export-filename', help='Save backtest results to the file with this filename (default: `%(default)s`). ' 'Requires `--export` to be set as well. ' - 'Example: `--export-filename=user_data/backtest_data/backtest_today.json`', + 'Example: `--export-filename=user_data/backtest_results/backtest_today.json`', metavar='PATH', - default=os.path.join('user_data', 'backtest_data', + default=os.path.join('user_data', 'backtest_results', 'backtest-result.json'), ), # Edge diff --git a/user_data/backtest_results/.gitkeep b/user_data/backtest_results/.gitkeep new file mode 100644 index 000000000..e69de29bb