Skip to content

Commit

Permalink
Fix on charts creation due to ichimoku analyzer
Browse files Browse the repository at this point in the history
  • Loading branch information
laliux committed Aug 1, 2020
1 parent a0a0b77 commit 51d184e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 20 deletions.
37 changes: 19 additions & 18 deletions app/analyzers/indicators/ichimoku.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,27 @@ def analyze(self, historical_data, tenkansen_period, kijunsen_period, senkou_spa
(ichimoku_values['tenkansen'] + ichimoku_values['kijunsen']) / 2)
ichimoku_values['leading_span_b'] = (high_senkou + low_senkou) / 2

# add time period for cloud offset
## if cloud discplacement changed the ichimuko plot will be off ##
cloud_displacement = 26
last_time = dataframe.index[-1]
timedelta = dataframe.index[1] - dataframe.index[0]
newindex = pandas.DatetimeIndex(start=last_time + timedelta,
freq=timedelta,
periods=cloud_displacement)
ichimoku_values = ichimoku_values.append(
pandas.DataFrame(index=newindex))
# cloud offset
ichimoku_values['leading_span_a'] = ichimoku_values['leading_span_a'].shift(
cloud_displacement)
ichimoku_values['leading_span_b'] = ichimoku_values['leading_span_b'].shift(
cloud_displacement)

ichimoku_values['is_hot'] = False
ichimoku_values['is_cold'] = False

try:
# add time period for cloud offset
## if cloud discplacement changed the ichimuko plot will be off ##
cloud_displacement = 26
last_time = dataframe.index[-1]
timedelta = dataframe.index[1] - dataframe.index[0]
newindex = pandas.DatetimeIndex(start=last_time + timedelta,
freq=timedelta,
periods=cloud_displacement)
ichimoku_values = ichimoku_values.append(
pandas.DataFrame(index=newindex))
# cloud offset
ichimoku_values['leading_span_a'] = ichimoku_values['leading_span_a'].shift(
cloud_displacement)
ichimoku_values['leading_span_b'] = ichimoku_values['leading_span_b'].shift(
cloud_displacement)


for index in range(0, ichimoku_values.index.shape[0]):
date = ichimoku_values.index[index]

Expand All @@ -97,8 +98,8 @@ def analyze(self, historical_data, tenkansen_period, kijunsen_period, senkou_spa
else:
pass

except KeyError as e:
print('keyerror: {}'.format(e))
except Exception as e:
print('Error running ichimoku analysis: {}'.format(e))

if chart == None:
ichimoku_values.dropna(how='any', inplace=True)
Expand Down
6 changes: 4 additions & 2 deletions app/notification.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,10 @@ def notify_all_messages(self, exchange, market_pair, candle_period, messages):
chart_file = self.create_chart(
exchange, market_pair, candle_period, candles_data)
#self.logger.info('Chart file %s', chart_file)
except Exception:
except Exception as e:
self.logger.info('Error creating chart for %s %s',
market_pair, candle_period)
self.logger.exception(e)

# self.notify_slack(new_analysis)
self.notify_discord(messages)
Expand Down Expand Up @@ -678,9 +679,10 @@ def create_charts(self, messages):
try:
self.create_chart(
exchange, market_pair, candle_period, candles_data)
except Exception:
except Exception as e:
self.logger.info(
'Error creating chart for %s %s', market_pair, candle_period)
self.logger.exception(e)

def create_chart(self, exchange, market_pair, candle_period, candles_data):

Expand Down

0 comments on commit 51d184e

Please sign in to comment.