Merge branch 'develop' into plot_profit

This commit is contained in:
kryofly
2018-01-26 10:07:48 +01:00
37 changed files with 1551 additions and 473 deletions

View File

@@ -3,14 +3,23 @@
import sys
import logging
import argparse
import matplotlib
# matplotlib.use("Qt5Agg")
import matplotlib.dates as mdates
import matplotlib.pyplot as plt
from pandas import DataFrame
import talib.abstract as ta
import freqtrade.vendor.qtpylib.indicators as qtpylib
from freqtrade import exchange, analyze
from freqtrade.misc import common_args_parser
from freqtrade.strategy.strategy import Strategy
import freqtrade.misc as misc
import freqtrade.optimize as optimize
import freqtrade.analyze as analyze
logger = logging.getLogger(__name__)
@@ -21,7 +30,7 @@ def plot_parse_args(args):
return parser.parse_args(args)
def plot_analyzed_dataframe(args):
def plot_analyzed_dataframe(args) -> None:
"""
Calls analyze() and plots the returned dataframe
:param pair: pair as str
@@ -31,35 +40,40 @@ def plot_analyzed_dataframe(args):
pairs = [pair]
timerange = misc.parse_timerange(args.timerange)
# Init strategy
strategy = Strategy()
strategy.init({'strategy': args.strategy})
tick_interval = strategy.ticker_interval
tickers = {}
if args.live:
logger.info('Downloading pair.')
# Init Bittrex to use public API
exchange._API = exchange.Bittrex({'key': '', 'secret': ''})
tickers[pair] = exchange.get_ticker_history(pair, args.ticker_interval)
tickers[pair] = exchange.get_ticker_history(pair, tick_interval)
else:
tickers = optimize.load_data(args.datadir, pairs=pairs,
ticker_interval=args.ticker_interval,
ticker_interval=tick_interval,
refresh_pairs=False,
timerange=timerange)
dataframes = optimize.tickerdata_to_dataframe(tickers)
dataframe = dataframes[pair]
dataframe = analyze.populate_buy_trend(dataframe)
dataframe = analyze.populate_sell_trend(dataframe)
dates = misc.datesarray_to_datetimearray(dataframe['date'])
dataframe.loc[dataframe['buy'] == 1, 'buy_price'] = dataframe['close']
dataframe.loc[dataframe['sell'] == 1, 'sell_price'] = dataframe['close']
# Two subplots sharing x axis
fig, (ax1, ax2, ax3) = plt.subplots(3, sharex=True)
fig.suptitle(pair + " " + str(args.ticker_interval), fontsize=14, fontweight='bold')
fig.suptitle(pair + " " + str(tick_interval), fontsize=14, fontweight='bold')
ax1.plot(dates, dataframe['close'], label='close')
# ax1.plot(dates, dataframe['sell'], 'ro', label='sell')
ax1.plot(dates, dataframe['sma'], '--', label='SMA')
ax1.plot(dates, dataframe['tema'], ':', label='TEMA')
ax1.plot(dates, dataframe['blower'], '-.', label='BB low')
ax1.plot(dates, dataframe['buy_price'], 'bo', label='buy')
ax1.plot(dates, dataframe['close'] * dataframe['buy'], 'bo', label='buy')
ax1.plot(dates, dataframe['close'] * dataframe['sell'], 'ro', label='sell')
ax1.legend()
ax2.plot(dates, dataframe['adx'], label='ADX')
@@ -81,7 +95,6 @@ def plot_analyzed_dataframe(args):
plt.setp([a.get_xticklabels() for a in fig.axes[:-1]], visible=False)
plt.show()
if __name__ == '__main__':
args = plot_parse_args(sys.argv[1:])
plot_analyzed_dataframe(args)