Merge branch 'develop' into feat/backslap_abstract

This commit is contained in:
Matthias
2018-08-14 14:11:38 +02:00
28 changed files with 413 additions and 64 deletions

View File

@@ -235,7 +235,7 @@ def download_backtesting_testdata(datadir: str,
logger.debug("Current Start: %s", misc.format_ms_time(data[1][0]) if data else 'None')
logger.debug("Current End: %s", misc.format_ms_time(data[-1][0]) if data else 'None')
new_data = exchange.get_ticker_history(pair=pair, tick_interval=tick_interval,
new_data = exchange.get_candle_history(pair=pair, tick_interval=tick_interval,
since_ms=since_ms)
data.extend(new_data)

View File

@@ -9,9 +9,7 @@ from typing import Any, Dict, List, Optional
from pandas import DataFrame
import freqtrade.optimize as optimize
from freqtrade.optimize.optimize import IOptimize, BacktestResult, setup_configuration
from freqtrade.arguments import Arguments
from freqtrade.persistence import Trade
from freqtrade.strategy.interface import SellType
@@ -157,8 +155,6 @@ class Backtesting(IOptimize):
return DataFrame.from_records(trades, columns=BacktestResult._fields)
def start(args: Namespace) -> None:
"""