add --limit-max-trades

This commit is contained in:
gcarq 2017-11-23 00:25:06 +01:00
parent 02ca2ed585
commit 4a707d7452
3 changed files with 40 additions and 16 deletions

View File

@ -150,6 +150,12 @@ def build_subcommands(parser: argparse.ArgumentParser) -> None:
type=int, type=int,
metavar='INT', metavar='INT',
) )
backtest.add_argument(
'--limit-max-trades',
help='uses max_open_trades from config to simulate real world limitations',
action='store_true',
dest='limit_max_trades',
)
def start_backtesting(args) -> None: def start_backtesting(args) -> None:
@ -165,6 +171,7 @@ def start_backtesting(args) -> None:
'BACKTEST_LIVE': 'true' if args.live else '', 'BACKTEST_LIVE': 'true' if args.live else '',
'BACKTEST_CONFIG': args.config, 'BACKTEST_CONFIG': args.config,
'BACKTEST_TICKER_INTERVAL': str(args.ticker_interval), 'BACKTEST_TICKER_INTERVAL': str(args.ticker_interval),
'BACKTEST_LIMIT_MAX_TRADES': 'true' if args.limit_max_trades else '',
}) })
path = os.path.join(os.path.dirname(__file__), 'tests', 'test_backtesting.py') path = os.path.join(os.path.dirname(__file__), 'tests', 'test_backtesting.py')
pytest.main(['-s', path]) pytest.main(['-s', path])

View File

@ -83,33 +83,45 @@ def generate_text_table(data: Dict[str, Dict], results: DataFrame, stake_currenc
return tabulate(tabular_data, headers=headers) return tabulate(tabular_data, headers=headers)
def backtest(backtest_conf, processed, mocker): def backtest(config: Dict, processed, mocker, max_open_trades=0):
"""
Implements backtesting functionality
:param config: config to use
:param processed: a processed dictionary with format {pair, data}
:param mocker: mocker instance
:param max_open_trades: maximum number of concurrent trades (default: 0, disabled)
:return: DataFrame
"""
trades = [] trades = []
trade_count_lock = {} trade_count_lock = {}
exchange._API = Bittrex({'key': '', 'secret': ''}) exchange._API = Bittrex({'key': '', 'secret': ''})
mocker.patch.dict('freqtrade.main._CONF', backtest_conf) mocker.patch.dict('freqtrade.main._CONF', config)
for pair, pair_data in processed.items(): for pair, pair_data in processed.items():
pair_data['buy'], pair_data['sell'] = 0, 0 pair_data['buy'], pair_data['sell'] = 0, 0
ticker = populate_sell_trend(populate_buy_trend(pair_data)) ticker = populate_sell_trend(populate_buy_trend(pair_data))
# for each buy point # for each buy point
for row in ticker[ticker.buy == 1].itertuples(index=True): for row in ticker[ticker.buy == 1].itertuples(index=True):
# Check if max_open_trades has already been reached for the given date if max_open_trades > 0:
if not trade_count_lock.get(row.date, 0) < backtest_conf['max_open_trades']: # Check if max_open_trades has already been reached for the given date
continue if not trade_count_lock.get(row.date, 0) < max_open_trades:
continue
if max_open_trades > 0:
# Increase lock
trade_count_lock[row.date] = trade_count_lock.get(row.date, 0) + 1
# Increase lock
trade_count_lock[row.date] = trade_count_lock.get(row.date, 0) + 1
trade = Trade( trade = Trade(
open_rate=row.close, open_rate=row.close,
open_date=row.date, open_date=row.date,
amount=backtest_conf['stake_amount'], amount=config['stake_amount'],
fee=exchange.get_fee() * 2 fee=exchange.get_fee() * 2
) )
# calculate win/lose forwards from buy point # calculate win/lose forwards from buy point
for row2 in ticker[row.Index + 1:].itertuples(index=True): for row2 in ticker[row.Index + 1:].itertuples(index=True):
# Increase trade_count_lock for every iteration if max_open_trades > 0:
trade_count_lock[row2.date] = trade_count_lock.get(row2.date, 0) + 1 # Increase trade_count_lock for every iteration
trade_count_lock[row2.date] = trade_count_lock.get(row2.date, 0) + 1
if min_roi_reached(trade, row2.close, row2.date) or row2.sell == 1: if min_roi_reached(trade, row2.close, row2.date) or row2.sell == 1:
current_profit = trade.calc_profit(row2.close) current_profit = trade.calc_profit(row2.close)
@ -120,6 +132,13 @@ def backtest(backtest_conf, processed, mocker):
return DataFrame.from_records(trades, columns=labels) return DataFrame.from_records(trades, columns=labels)
def get_max_open_trades(config):
if not os.environ.get('BACKTEST_LIMIT_MAX_TRADES'):
return 0
print('Using max_open_trades: {} ...'.format(config['max_open_trades']))
return config['max_open_trades']
@pytest.mark.skipif(not os.environ.get('BACKTEST'), reason="BACKTEST not set") @pytest.mark.skipif(not os.environ.get('BACKTEST'), reason="BACKTEST not set")
def test_backtest(backtest_conf, mocker): def test_backtest(backtest_conf, mocker):
print('') print('')
@ -150,8 +169,6 @@ def test_backtest(backtest_conf, mocker):
config['stake_currency'], config['stake_amount'] config['stake_currency'], config['stake_amount']
)) ))
print('Using max_open_trades: {} ...'.format(config['max_open_trades']))
# Print timeframe # Print timeframe
min_date, max_date = get_timeframe(data) min_date, max_date = get_timeframe(data)
print('Measuring data from {} up to {} ...'.format( print('Measuring data from {} up to {} ...'.format(
@ -159,8 +176,6 @@ def test_backtest(backtest_conf, mocker):
)) ))
# Execute backtest and print results # Execute backtest and print results
results = backtest(config, preprocess(data), mocker) results = backtest(config, preprocess(data), mocker, get_max_open_trades(config))
print('====================== BACKTESTING REPORT ======================================\n\n' print('====================== BACKTESTING REPORT ======================================\n\n')
'NOTE: This Report doesn\'t respect the limits of max_open_trades, \n'
' so the projected values should be taken with a grain of salt.\n')
print(generate_text_table(data, results, config['stake_currency'])) print(generate_text_table(data, results, config['stake_currency']))

View File

@ -109,6 +109,7 @@ def test_start_backtesting(mocker):
live=True, live=True,
loglevel=20, loglevel=20,
ticker_interval=1, ticker_interval=1,
limit_max_trades=True,
) )
start_backtesting(args) start_backtesting(args)
assert env_mock == { assert env_mock == {
@ -116,6 +117,7 @@ def test_start_backtesting(mocker):
'BACKTEST_LIVE': 'true', 'BACKTEST_LIVE': 'true',
'BACKTEST_CONFIG': 'config.json', 'BACKTEST_CONFIG': 'config.json',
'BACKTEST_TICKER_INTERVAL': '1', 'BACKTEST_TICKER_INTERVAL': '1',
'BACKTEST_LIMIT_MAX_TRADES': 'true',
} }
assert pytest_mock.call_count == 1 assert pytest_mock.call_count == 1