From 6ff26c561a64d0cff64b802d0ffb8793ba89ded8 Mon Sep 17 00:00:00 2001 From: gcarq Date: Thu, 9 Nov 2017 22:29:23 +0100 Subject: [PATCH] move plot_dataframe to scripts/ folder --- .coveragerc | 1 + freqtrade/analyze.py | 54 +-------------------------------------- scripts/plot_dataframe.py | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 53 deletions(-) create mode 100755 scripts/plot_dataframe.py diff --git a/.coveragerc b/.coveragerc index 9e4dc2c18..95eea4f8f 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,5 @@ [run] omit = + scripts/* freqtrade/tests/* freqtrade/vendor/* \ No newline at end of file diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py index 32bce45e0..7f504e215 100644 --- a/freqtrade/analyze.py +++ b/freqtrade/analyze.py @@ -1,13 +1,11 @@ import logging -import time from datetime import timedelta import arrow import talib.abstract as ta from pandas import DataFrame, to_datetime -from freqtrade import exchange -from freqtrade.exchange import Bittrex, get_ticker_history +from freqtrade.exchange import get_ticker_history from freqtrade.vendor.qtpylib.indicators import awesome_oscillator logging.basicConfig(level=logging.DEBUG, @@ -115,53 +113,3 @@ def get_buy_signal(pair: str) -> bool: signal = latest['buy'] == 1 logger.debug('buy_trigger: %s (pair=%s, signal=%s)', latest['date'], pair, signal) return signal - - -def plot_analyzed_dataframe(pair: str) -> None: - """ - Calls analyze() and plots the returned dataframe - :param pair: pair as str - :return: None - """ - import matplotlib - matplotlib.use("Qt5Agg") - import matplotlib.pyplot as plt - - # Init Bittrex to use public API - exchange._API = Bittrex({'key': '', 'secret': ''}) - dataframe = analyze_ticker(pair) - - # Two subplots sharing x axis - fig, (ax1, ax2, ax3) = plt.subplots(3, sharex=True) - fig.suptitle(pair, fontsize=14, fontweight='bold') - ax1.plot(dataframe.index.values, dataframe['close'], label='close') - # ax1.plot(dataframe.index.values, dataframe['sell'], 'ro', label='sell') - ax1.plot(dataframe.index.values, dataframe['sma'], '--', label='SMA') - ax1.plot(dataframe.index.values, dataframe['tema'], ':', label='TEMA') - ax1.plot(dataframe.index.values, dataframe['blower'], '-.', label='BB low') - ax1.plot(dataframe.index.values, dataframe['buy_price'], 'bo', label='buy') - ax1.legend() - - ax2.plot(dataframe.index.values, dataframe['adx'], label='ADX') - ax2.plot(dataframe.index.values, dataframe['mfi'], label='MFI') - # ax2.plot(dataframe.index.values, [25] * len(dataframe.index.values)) - ax2.legend() - - ax3.plot(dataframe.index.values, dataframe['fastk'], label='k') - ax3.plot(dataframe.index.values, dataframe['fastd'], label='d') - ax3.plot(dataframe.index.values, [20] * len(dataframe.index.values)) - ax3.legend() - - # Fine-tune figure; make subplots close to each other and hide x ticks for - # all but bottom plot. - fig.subplots_adjust(hspace=0) - plt.setp([a.get_xticklabels() for a in fig.axes[:-1]], visible=False) - plt.show() - - -if __name__ == '__main__': - # Install PYQT5==5.9 manually if you want to test this helper function - while True: - for p in ['BTC_ANT', 'BTC_ETH', 'BTC_GNT', 'BTC_ETC']: - plot_analyzed_dataframe(p) - time.sleep(60) diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py new file mode 100755 index 000000000..32d9b3cfa --- /dev/null +++ b/scripts/plot_dataframe.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python3 + +import matplotlib # Install PYQT5 manually if you want to test this helper function +matplotlib.use("Qt5Agg") +import matplotlib.pyplot as plt + +from freqtrade import exchange, analyze + + +def plot_analyzed_dataframe(pair: str) -> None: + """ + Calls analyze() and plots the returned dataframe + :param pair: pair as str + :return: None + """ + + # Init Bittrex to use public API + exchange._API = exchange.Bittrex({'key': '', 'secret': ''}) + dataframe = analyze.analyze_ticker(pair) + + # Two subplots sharing x axis + fig, (ax1, ax2, ax3) = plt.subplots(3, sharex=True) + fig.suptitle(pair, fontsize=14, fontweight='bold') + ax1.plot(dataframe.index.values, dataframe['close'], label='close') + # ax1.plot(dataframe.index.values, dataframe['sell'], 'ro', label='sell') + ax1.plot(dataframe.index.values, dataframe['sma'], '--', label='SMA') + ax1.plot(dataframe.index.values, dataframe['tema'], ':', label='TEMA') + ax1.plot(dataframe.index.values, dataframe['blower'], '-.', label='BB low') + ax1.plot(dataframe.index.values, dataframe['buy_price'], 'bo', label='buy') + ax1.legend() + + ax2.plot(dataframe.index.values, dataframe['adx'], label='ADX') + ax2.plot(dataframe.index.values, dataframe['mfi'], label='MFI') + # ax2.plot(dataframe.index.values, [25] * len(dataframe.index.values)) + ax2.legend() + + ax3.plot(dataframe.index.values, dataframe['fastk'], label='k') + ax3.plot(dataframe.index.values, dataframe['fastd'], label='d') + ax3.plot(dataframe.index.values, [20] * len(dataframe.index.values)) + ax3.legend() + + # Fine-tune figure; make subplots close to each other and hide x ticks for + # all but bottom plot. + fig.subplots_adjust(hspace=0) + plt.setp([a.get_xticklabels() for a in fig.axes[:-1]], visible=False) + plt.show() + + +if __name__ == '__main__': + plot_analyzed_dataframe('BTC_ETH') +