fixed import

This commit is contained in:
Mark 2022-05-11 13:35:29 +03:00
parent 60a9c3c1a1
commit d19359e972

View File

@ -50,12 +50,12 @@ class BB:
'window':self.options['window'] 'window':self.options['window']
} }
} }
ans['BB']=CoreTraidMath.CoreMath(self.base_df,opMA).ans ans['BB']=market_trade.core.CoreTraidMath.CoreMath(self.base_df,opMA).ans
opSTD={'dataType':'ohcl', opSTD={'dataType':'ohcl',
'action':'findSTD', 'action':'findSTD',
'actionOptions':{'valueType':self.options['valueType'],'window':self.options['window']} 'actionOptions':{'valueType':self.options['valueType'],'window':self.options['window']}
} }
ans['STD']=CoreTraidMath.CoreMath(self.base_df,opSTD).ans ans['STD']=market_trade.core.CoreTraidMath.CoreMath(self.base_df,opSTD).ans
ans['pSTD']=ans['BB']+ans['STD']*self.options['kDev'] ans['pSTD']=ans['BB']+ans['STD']*self.options['kDev']
ans['mSTD']=ans['BB']-ans['STD']*self.options['kDev'] ans['mSTD']=ans['BB']-ans['STD']*self.options['kDev']
ans['x']=np.array(self.base_df['date'][self.options['window']-1:].to_list()) ans['x']=np.array(self.base_df['date'][self.options['window']-1:].to_list())