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

designed a test which works!

Browse Source
This commit is contained in:
Mark 2024-03-19 13:29:08 +01:00
parent fffd4b9e58
commit fa46ed472f
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
market_trade/core/trandeVoter.py
View File

@ -44,8 +44,9 @@ class trandeVoter():
#заполнение матрицы вероятностей вычисляемыми значениями из матрицы сумм #заполнение матрицы вероятностей вычисляемыми значениями из матрицы сумм
def generateMatrixProbability(self) -> None: def generateMatrixProbability(self) -> None:
for i in range(self.matrixAmounts.shape[0]): for i in range(self.matrixAmounts.shape[0]):
rowSum=sum(self.matrixAmounts.iloc[i]) print(self.matrixAmounts)
self.matrixProbability.iloc[i]['up'] = (self.matrixAmounts.iloc[i]['up'] / rowSum) rowSum=sum(self.matrixAmounts.iloc[i]) + 1
self.matrixProbability.iloc[i]['up'] = self.matrixAmounts.iloc[i]['up'] / rowSum
self.matrixProbability.iloc[i]['none'] = self.matrixAmounts.iloc[i]['none'] / rowSum self.matrixProbability.iloc[i]['none'] = self.matrixAmounts.iloc[i]['none'] / rowSum
self.matrixProbability.iloc[i]['down'] = self.matrixAmounts.iloc[i]['down'] / rowSum self.matrixProbability.iloc[i]['down'] = self.matrixAmounts.iloc[i]['down'] / rowSum

17
market_trade/tests/test_decision.py
View File

@ -45,6 +45,19 @@ sigAgrRetroTemplate = {
} }
} }
retroAns = test.getRetroTrendAns(sigAgrRetroTemplate,df_candle[:5000],40) retroAns = test.getRetroTrendAns(sigAgrRetroTemplate,df_candle[5000:6000].reset_index(drop=True),40)
print(test.generateMatrixProbabilityFromDict(retroAns)) test.generateMatrixProbabilityFromDict(retroAns)
sigAgrData = {
'sig_BB':{
'signalData': df_candle[990:1000],
'indicatorData' :{'ind_BB': df_candle[:1000]}
},
'sig_BB_2':{
'signalData': df_candle[990:1000],
'indicatorData' :{'ind_BB': df_candle[:1000]}
}
}
test.getOnlineAns(sigAgrData, 0.0)