Skip to content

Commit

Permalink
Merge pull request freqtrade#131 from gcarq/feature/backtesting-max-o…
Browse files Browse the repository at this point in the history
…pen-trades

implement trade count lock for backtesting
  • Loading branch information
vertti authored Nov 23, 2017
2 parents 21551b3 + 4a707d7 commit aacd7d8
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 10 deletions.
1 change: 1 addition & 0 deletions freqtrade/analyze.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def populate_buy_trend(dataframe: DataFrame) -> DataFrame:

return dataframe


def populate_sell_trend(dataframe: DataFrame) -> DataFrame:
"""
Based on TA indicators, populates the sell signal for the given dataframe
Expand Down
7 changes: 7 additions & 0 deletions freqtrade/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,12 @@ def build_subcommands(parser: argparse.ArgumentParser) -> None:
type=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:
Expand All @@ -161,6 +167,7 @@ def start_backtesting(args) -> None:
'BACKTEST_LIVE': 'true' if args.live else '',
'BACKTEST_CONFIG': args.config,
'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')
pytest.main(['-s', path])
Expand Down
1 change: 1 addition & 0 deletions freqtrade/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def default_conf():
@pytest.fixture(scope="module")
def backtest_conf():
return {
"max_open_trades": 3,
"stake_currency": "BTC",
"stake_amount": 0.01,
"minimal_roi": {
Expand Down
47 changes: 37 additions & 10 deletions freqtrade/tests/test_backtesting.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,46 @@ def generate_text_table(data: Dict[str, Dict], results: DataFrame, stake_currenc
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 = []
trade_count_lock = {}
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():
pair_data['buy'] = 0
pair_data['sell'] = 0
pair_data['buy'], pair_data['sell'] = 0, 0
ticker = populate_sell_trend(populate_buy_trend(pair_data))
# for each buy point
for row in ticker[ticker.buy == 1].itertuples(index=True):
if max_open_trades > 0:
# Check if max_open_trades has already been reached for the given date
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

trade = Trade(
open_rate=row.close,
open_date=row.date,
amount=backtest_conf['stake_amount'],
amount=config['stake_amount'],
fee=exchange.get_fee() * 2
)

# calculate win/lose forwards from buy point
for row2 in ticker[row.Index:].itertuples(index=True):
for row2 in ticker[row.Index + 1:].itertuples(index=True):
if max_open_trades > 0:
# 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:
current_profit = trade.calc_profit(row2.close)

Expand All @@ -110,6 +132,13 @@ def backtest(backtest_conf, processed, mocker):
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")
def test_backtest(backtest_conf, mocker):
print('')
Expand Down Expand Up @@ -147,8 +176,6 @@ def test_backtest(backtest_conf, mocker):
))

# Execute backtest and print results
results = backtest(config, preprocess(data), mocker)
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')
results = backtest(config, preprocess(data), mocker, get_max_open_trades(config))
print('====================== BACKTESTING REPORT ======================================\n\n')
print(generate_text_table(data, results, config['stake_currency']))
2 changes: 2 additions & 0 deletions freqtrade/tests/test_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@ def test_start_backtesting(mocker):
live=True,
loglevel=20,
ticker_interval=1,
limit_max_trades=True,
)
start_backtesting(args)
assert env_mock == {
'BACKTEST': 'true',
'BACKTEST_LIVE': 'true',
'BACKTEST_CONFIG': 'config.json',
'BACKTEST_TICKER_INTERVAL': '1',
'BACKTEST_LIMIT_MAX_TRADES': 'true',
}
assert pytest_mock.call_count == 1

Expand Down

0 comments on commit aacd7d8

Please sign in to comment.