Update CoreTraidMath.py

This commit is contained in:
Redsandy 2022-03-04 23:20:25 +03:00 committed by GitHub
parent 704b4e2c39
commit dee6205ab6

View File

@ -100,8 +100,8 @@ class CoreMath:
if self.params['actionOptions']['MeanType']=='MA': if self.params['actionOptions']['MeanType']=='MA':
ans = self.col.mean() ans = self.col.mean()
if self.params['actionOptions']['MeanType']=='SMA': if self.params['actionOptions']['MeanType']=='SMA':
#ans=np.convolve(self.col, np.ones(self.params['actionOptions']['window']), 'valid') / self.params['actionOptions']['window'] ans=np.convolve(self.col, np.ones(self.params['actionOptions']['window']), 'valid') / self.params['actionOptions']['window']
ans=self.col.rolling(window=self.params['actionOptions']['window']).mean().to_list() #ans=self.col.rolling(window=self.params['actionOptions']['window']).mean().to_list()
if self.params['actionOptions']['MeanType']=='EMA': if self.params['actionOptions']['MeanType']=='EMA':
ans=self.col.ewm(span=self.params['actionOptions']['span'], adjust=False).mean().to_list() ans=self.col.ewm(span=self.params['actionOptions']['span'], adjust=False).mean().to_list()
if self.params['actionOptions']['MeanType']=='WMA': if self.params['actionOptions']['MeanType']=='WMA':