From 6bfe0eecd235ab5a9f424ac3c84f1ab8c2a24b3b Mon Sep 17 00:00:00 2001 From: fredfortier Date: Wed, 27 Sep 2017 17:27:40 -0400 Subject: [PATCH] Remove some 5-minute data and added example of extension.py. --- .../buy_low_sell_high_neo_with_interface.py | 33 ++++++++++--------- .../exchange/bittrex/extensions-example.py | 7 ++++ catalyst/exchange/data_portal_exchange.py | 10 ------ catalyst/exchange/exchange_bundle.py | 17 ++-------- 4 files changed, 27 insertions(+), 40 deletions(-) create mode 100644 catalyst/exchange/bittrex/extensions-example.py diff --git a/catalyst/examples/buy_low_sell_high_neo_with_interface.py b/catalyst/examples/buy_low_sell_high_neo_with_interface.py index 88f22766..4a9cc4c5 100644 --- a/catalyst/examples/buy_low_sell_high_neo_with_interface.py +++ b/catalyst/examples/buy_low_sell_high_neo_with_interface.py @@ -144,28 +144,31 @@ def handle_data(context, data): def analyze(context, stats): log.info('the daily stats:\n{}'.format(get_pretty_stats(stats))) + pass -# run_algorithm( -# initialize=initialize, -# handle_data=handle_data, -# analyze=analyze, -# exchange_name='bittrex,bitfinex', -# live=True, -# algo_namespace=algo_namespace, -# base_currency='btc', -# live_graph=False -# ) run_algorithm( - capital_base=250, - start=pd.to_datetime('2017-09-08', utc=True), - end=pd.to_datetime('2017-09-15', utc=True), - data_frequency='minute', initialize=initialize, handle_data=handle_data, analyze=analyze, exchange_name='bitfinex', + live=True, algo_namespace=algo_namespace, - base_currency='btc' + base_currency='btc', + live_graph=False ) + +# Backtest +# run_algorithm( +# capital_base=250, +# start=pd.to_datetime('2017-09-08', utc=True), +# end=pd.to_datetime('2017-09-15', utc=True), +# data_frequency='minute', +# initialize=initialize, +# handle_data=handle_data, +# analyze=analyze, +# exchange_name='bitfinex', +# algo_namespace=algo_namespace, +# base_currency='btc' +# ) diff --git a/catalyst/exchange/bittrex/extensions-example.py b/catalyst/exchange/bittrex/extensions-example.py new file mode 100644 index 00000000..33ffb4f5 --- /dev/null +++ b/catalyst/exchange/bittrex/extensions-example.py @@ -0,0 +1,7 @@ +from catalyst.data.bundles import register +from catalyst.exchange.exchange_bundle import exchange_bundle + +symbols = ( + 'neo_btc', +) +register('exchange_bitfinex', exchange_bundle('bitfinex', symbols)) \ No newline at end of file diff --git a/catalyst/exchange/data_portal_exchange.py b/catalyst/exchange/data_portal_exchange.py index c0af0e32..88808fa6 100644 --- a/catalyst/exchange/data_portal_exchange.py +++ b/catalyst/exchange/data_portal_exchange.py @@ -282,14 +282,6 @@ class DataPortalExchangeBacktest(DataPortalExchangeBase): except IOError: self.daily_bar_readers[exchange_name] = None - try: - self.five_minute_bar_readers[exchange_name] = \ - BcolzFiveMinuteBarReader( - five_minute_path(name, time_folder), - ) - except IOError: - self.five_minute_bar_readers[exchange_name] = None - try: self.minute_bar_readers[exchange_name] = \ BcolzMinuteBarReader( @@ -351,8 +343,6 @@ class DataPortalExchangeBacktest(DataPortalExchangeBase): """ if data_frequency == 'minute': reader = self.minute_bar_readers[exchange_name] - elif data_frequency == '5-minute': - reader = self.five_minute_bar_readers[exchange_name] elif data_frequency == 'daily': reader = self.daily_bar_readers[exchange_name] else: diff --git a/catalyst/exchange/exchange_bundle.py b/catalyst/exchange/exchange_bundle.py index 9446a88a..df640311 100644 --- a/catalyst/exchange/exchange_bundle.py +++ b/catalyst/exchange/exchange_bundle.py @@ -47,10 +47,6 @@ def process_bar_data(exchange, assets, writer, data_frequency, delta_periods = delta.total_seconds() / 60 frequency = '1m' - elif data_frequency == '5-minute': - delta_periods = delta.total_seconds() / 60 / 5 - frequency = '5m' - elif data_frequency == 'daily': delta_periods = delta.total_seconds() / 60 / 60 / 24 frequency = '1d' @@ -295,17 +291,8 @@ def exchange_bundle(exchange_name, symbols=None, start=None, end=None, # start=start, # end=end # ) - # - # if five_minute_bar_writer is not None: - # process_bar_data( - # exchange=exchange, - # assets=assets, - # writer=five_minute_bar_writer, - # data_frequency='5-minute', - # show_progress=show_progress, - # start=start, - # end=end - # ) + + # TODO: delete 5-minute writer everywhere if minute_bar_writer is not None: process_bar_data(