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

log message adjusted in backtesting and hyperopt

Browse Source
This commit is contained in:
hroff-1902 2019-05-15 12:05:35 +03:00
parent 90a52e4602
commit 8b95e12468
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/optimize/backtesting.py
View File

@ -445,7 +445,7 @@ class Backtesting(object):
optimize.validate_backtest_data(data, min_date, max_date, optimize.validate_backtest_data(data, min_date, max_date,
timeframe_to_minutes(self.ticker_interval)) timeframe_to_minutes(self.ticker_interval))
logger.info( logger.info(
'Measuring data from %s up to %s (%s days)..', 'Backtesting with data from %s up to %s (%s days)..',
min_date.isoformat(), min_date.isoformat(),
max_date.isoformat(), max_date.isoformat(),
(max_date - min_date).days (max_date - min_date).days

2
freqtrade/optimize/hyperopt.py
View File

@ -292,7 +292,7 @@ class Hyperopt(Backtesting):
validate_backtest_data(data, min_date, max_date, validate_backtest_data(data, min_date, max_date,
timeframe_to_minutes(self.ticker_interval)) timeframe_to_minutes(self.ticker_interval))
logger.info( logger.info(
'Backtesting data from %s up to %s (%s days)..', 'Hyperopting with data from %s up to %s (%s days)..',
min_date.isoformat(), min_date.isoformat(),
max_date.isoformat(), max_date.isoformat(),
(max_date - min_date).days (max_date - min_date).days

8
freqtrade/tests/optimize/test_backtesting.py
View File

@ -495,7 +495,7 @@ def test_backtesting_start(default_conf, mocker, caplog) -> None:
'Using local backtesting data (using whitelist in given config) ...', 'Using local backtesting data (using whitelist in given config) ...',
'Using stake_currency: BTC ...', 'Using stake_currency: BTC ...',
'Using stake_amount: 0.001 ...', 'Using stake_amount: 0.001 ...',
'Measuring data from 2017-11-14T21:17:00+00:00 ' 'Backtesting with data from 2017-11-14T21:17:00+00:00 '
'up to 2017-11-14T22:59:00+00:00 (0 days)..' 'up to 2017-11-14T22:59:00+00:00 (0 days)..'
] ]
for line in exists: for line in exists:
@ -858,7 +858,8 @@ def test_backtest_start_live(default_conf, mocker, caplog):
'Using stake_currency: BTC ...', 'Using stake_currency: BTC ...',
'Using stake_amount: 0.001 ...', 'Using stake_amount: 0.001 ...',
'Downloading data for all pairs in whitelist ...', 'Downloading data for all pairs in whitelist ...',
'Measuring data from 2017-11-14T19:31:00+00:00 up to 2017-11-14T22:58:00+00:00 (0 days)..', 'Backtesting with data from 2017-11-14T19:31:00+00:00 '
'up to 2017-11-14T22:58:00+00:00 (0 days)..',
'Parameter --enable-position-stacking detected ...' 'Parameter --enable-position-stacking detected ...'
] ]
@ -916,7 +917,8 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog):
'Using stake_currency: BTC ...', 'Using stake_currency: BTC ...',
'Using stake_amount: 0.001 ...', 'Using stake_amount: 0.001 ...',
'Downloading data for all pairs in whitelist ...', 'Downloading data for all pairs in whitelist ...',
'Measuring data from 2017-11-14T19:31:00+00:00 up to 2017-11-14T22:58:00+00:00 (0 days)..', 'Backtesting with data from 2017-11-14T19:31:00+00:00 '
'up to 2017-11-14T22:58:00+00:00 (0 days)..',
'Parameter --enable-position-stacking detected ...', 'Parameter --enable-position-stacking detected ...',
'Running backtesting for Strategy DefaultStrategy', 'Running backtesting for Strategy DefaultStrategy',
'Running backtesting for Strategy TestStrategy', 'Running backtesting for Strategy TestStrategy',