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

fix plot_profit to use strategy instead of Analyze

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

10
scripts/plot_profit.py
View File

@ -26,9 +26,8 @@ import plotly.graph_objs as go
from freqtrade.arguments import Arguments from freqtrade.arguments import Arguments
from freqtrade.configuration import Configuration from freqtrade.configuration import Configuration
from freqtrade.analyze import Analyze
from freqtrade import constants from freqtrade import constants
from freqtrade.strategy.resolver import StrategyResolver
import freqtrade.optimize as optimize import freqtrade.optimize as optimize
import freqtrade.misc as misc import freqtrade.misc as misc
@ -87,7 +86,8 @@ def plot_profit(args: Namespace) -> None:
# Init strategy # Init strategy
try: try:
analyze = Analyze({'strategy': config.get('strategy')}) strategy = StrategyResolver({'strategy': config.get('strategy')}).strategy
except AttributeError: except AttributeError:
logger.critical( logger.critical(
'Impossible to load the strategy. Please check the file "user_data/strategies/%s.py"', 'Impossible to load the strategy. Please check the file "user_data/strategies/%s.py"',
@ -113,7 +113,7 @@ def plot_profit(args: Namespace) -> None:
else: else:
filter_pairs = config['exchange']['pair_whitelist'] filter_pairs = config['exchange']['pair_whitelist']
tick_interval = analyze.strategy.ticker_interval tick_interval = strategy.ticker_interval
pairs = config['exchange']['pair_whitelist'] pairs = config['exchange']['pair_whitelist']
if filter_pairs: if filter_pairs:
@ -127,7 +127,7 @@ def plot_profit(args: Namespace) -> None:
refresh_pairs=False, refresh_pairs=False,
timerange=timerange timerange=timerange
) )
dataframes = analyze.tickerdata_to_dataframe(tickers) dataframes = strategy.tickerdata_to_dataframe(tickers)
# NOTE: the dataframes are of unequal length, # NOTE: the dataframes are of unequal length,
# 'dates' is an merged date array of them all. # 'dates' is an merged date array of them all.