Skip to content

Commit

Permalink
ema for p types
Browse files Browse the repository at this point in the history
  • Loading branch information
RichardFreedman committed Aug 3, 2023
1 parent 0f09244 commit cf02d7e
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions intervals/main_objs.py
Original file line number Diff line number Diff line change
Expand Up @@ -675,18 +675,21 @@ def emaAddresses(self, df=None, mode=''):
p_types['ema'] = p_types.apply(lambda row: self._ptype_ema_helper(row, ngrams), axis=1)
return p_types

idf = ret.index.to_frame()
_measures = self.measures().iloc[:, 0]
measures = idf.applymap(lambda i: _measures.loc[:i].iat[-1])
_beats = self.beatIndex()
beats = idf.applymap(lambda i: _beats[i])
res = pd.concat([measures['First'], beats['First'], measures['Last'], beats['Last']], axis=1)
res.columns = ['First Measure', 'First Beat', 'Last Measure', 'Last Beat']
ret = self.numberParts(ret)
res = pd.concat([res, ret], axis=1)
res = res.apply(self._emaRowHelper, axis=1)
res.name = 'EMA'
return res
if mode.startswith('p'):
pass
else:
idf = ret.index.to_frame()
_measures = self.measures().iloc[:, 0]
measures = idf.applymap(lambda i: _measures.loc[:i].iat[-1])
_beats = self.beatIndex()
beats = idf.applymap(lambda i: _beats[i])
res = pd.concat([measures['First'], beats['First'], measures['Last'], beats['Last']], axis=1)
res.columns = ['First Measure', 'First Beat', 'Last Measure', 'Last Beat']
ret = self.numberParts(ret)
res = pd.concat([res, ret], axis=1)
res = res.apply(self._emaRowHelper, axis=1)
res.name = 'EMA'
return res

def _getBeatUnit(self):
'''
Expand Down

0 comments on commit cf02d7e

Please sign in to comment.