veles/marketTrade
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from Redsandyg/Redsandyg-patch-3-1

Browse Source 
Update Ind_ADX.py
This commit is contained in:
Redsandy 2022-03-05 23:53:32 +03:00 committed by GitHub
commit 3a499ff25f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/Ind_ADX.py
View File

@ -34,7 +34,7 @@ class ADXI:
def __init__(self, base_df, options={ def __init__(self, base_df, options={
'dataType':'ohcl', 'dataType':'ohcl',
}, needShow=False,showOnlyIndex=True): }, needFig=False,showOnlyIndex=True,drawFig=False):
self.base_df=base_df.reset_index(drop=True) self.base_df=base_df.reset_index(drop=True)
self.options=options self.options=options
#self.norm_df=self.nornalize() #self.norm_df=self.nornalize()
@ -42,8 +42,8 @@ class ADXI:
#self.npCol=np.asarray(self.norm_df[self.col], dtype=np.float32) #self.npCol=np.asarray(self.norm_df[self.col], dtype=np.float32)
#self.options=options #self.options=options
self.ans=self.getAns() self.ans=self.getAns()
if needShow: if needFig:
self.fig=self.pltShow(showOnlyIndex) self.fig=self.pltShow(showOnlyIndex,drawFig)
def getDM(self): def getDM(self):
@ -116,7 +116,7 @@ class ADXI:
return ans return ans
def pltShow(self,showOnlyIndex): def pltShow(self,showOnlyIndex,drawFig):
ans=None ans=None
req=[] req=[]
@ -161,9 +161,11 @@ class ADXI:
}) })
self.figDict=req
ans = CoreDraw.coreDraw(req,True)
ans = CoreDraw.coreDraw(req,drawFig)
return ans return ans