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

fix plot_dataframe to use strategy instead of Analyze

Browse Source
This commit is contained in:
Janne Sinivirta 2018-07-17 11:41:21 +03:00
parent e11ec28962
commit 50b15b8052
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/plot_dataframe.py
View File

@ -40,11 +40,11 @@ from plotly.offline import plot
import freqtrade.optimize as optimize import freqtrade.optimize as optimize
from freqtrade import persistence from freqtrade import persistence
from freqtrade.analyze import Analyze
from freqtrade.arguments import Arguments, TimeRange from freqtrade.arguments import Arguments, TimeRange
from freqtrade.exchange import Exchange from freqtrade.exchange import Exchange
from freqtrade.optimize.backtesting import setup_configuration from freqtrade.optimize.backtesting import setup_configuration
from freqtrade.persistence import Trade from freqtrade.persistence import Trade
from freqtrade.strategy.resolver import StrategyResolver
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_CONF: Dict[str, Any] = {} _CONF: Dict[str, Any] = {}
@ -122,7 +122,7 @@ def plot_analyzed_dataframe(args: Namespace) -> None:
# Load the strategy # Load the strategy
try: try:
analyze = Analyze(_CONF) strategy = StrategyResolver(_CONF).strategy
exchange = Exchange(_CONF) exchange = Exchange(_CONF)
except AttributeError: except AttributeError:
logger.critical( logger.critical(
@ -132,7 +132,7 @@ def plot_analyzed_dataframe(args: Namespace) -> None:
exit() exit()
# Set the ticker to use # Set the ticker to use
tick_interval = analyze.get_ticker_interval() tick_interval = strategy.ticker_interval
# Load pair tickers # Load pair tickers
tickers = {} tickers = {}
@ -156,11 +156,11 @@ def plot_analyzed_dataframe(args: Namespace) -> None:
# Get trades already made from the DB # Get trades already made from the DB
trades = load_trades(args, pair, timerange) trades = load_trades(args, pair, timerange)
dataframes = analyze.tickerdata_to_dataframe(tickers) dataframes = strategy.tickerdata_to_dataframe(tickers)
dataframe = dataframes[pair] dataframe = dataframes[pair]
dataframe = analyze.populate_buy_trend(dataframe) dataframe = strategy.populate_buy_trend(dataframe)
dataframe = analyze.populate_sell_trend(dataframe) dataframe = strategy.populate_sell_trend(dataframe)
if len(dataframe.index) > args.plot_limit: if len(dataframe.index) > args.plot_limit:
logger.warning('Ticker contained more than %s candles as defined ' logger.warning('Ticker contained more than %s candles as defined '