Merge branch 'develop' into another-better-strategy

This commit is contained in:
Janne Sinivirta 2017-09-29 13:13:44 +03:00
commit 0085db825d

View File

@ -86,7 +86,7 @@ def analyze_ticker(pair: str) -> DataFrame:
add several TA indicators and buy signal to it add several TA indicators and buy signal to it
:return DataFrame with ticker data and indicator data :return DataFrame with ticker data and indicator data
""" """
minimum_date = arrow.utcnow().shift(hours=-6) minimum_date = arrow.utcnow().shift(hours=-24)
data = get_ticker(pair, minimum_date) data = get_ticker(pair, minimum_date)
dataframe = parse_ticker_dataframe(data['result'], minimum_date) dataframe = parse_ticker_dataframe(data['result'], minimum_date)
@ -159,7 +159,7 @@ def plot_dataframe(dataframe: DataFrame, pair: str) -> None:
if __name__ == '__main__': if __name__ == '__main__':
# Install PYQT5==5.9 manually if you want to test this helper function # Install PYQT5==5.9 manually if you want to test this helper function
while True: while True:
test_pair = 'BTC_ANT' test_pair = 'BTC_ETH'
#for pair in ['BTC_ANT', 'BTC_ETH', 'BTC_GNT', 'BTC_ETC']: #for pair in ['BTC_ANT', 'BTC_ETH', 'BTC_GNT', 'BTC_ETC']:
# get_buy_signal(pair) # get_buy_signal(pair)
plot_dataframe(analyze_ticker(test_pair), test_pair) plot_dataframe(analyze_ticker(test_pair), test_pair)