From dee6205ab64ad5cd01c7a95c63376d0c3760ddbf Mon Sep 17 00:00:00 2001 From: Redsandy <34872843+Redsandyg@users.noreply.github.com> Date: Fri, 4 Mar 2022 23:20:25 +0300 Subject: [PATCH] Update CoreTraidMath.py --- Core/CoreTraidMath.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/CoreTraidMath.py b/Core/CoreTraidMath.py index 24a0e60..dda9770 100644 --- a/Core/CoreTraidMath.py +++ b/Core/CoreTraidMath.py @@ -100,8 +100,8 @@ class CoreMath: if self.params['actionOptions']['MeanType']=='MA': ans = self.col.mean() if self.params['actionOptions']['MeanType']=='SMA': - #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=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() if self.params['actionOptions']['MeanType']=='EMA': ans=self.col.ewm(span=self.params['actionOptions']['span'], adjust=False).mean().to_list() if self.params['actionOptions']['MeanType']=='WMA':