diff --git a/market_trade/core/trandeVoter.py b/market_trade/core/trandeVoter.py index da23070..c4f988a 100644 --- a/market_trade/core/trandeVoter.py +++ b/market_trade/core/trandeVoter.py @@ -44,8 +44,9 @@ class trandeVoter(): #заполнение матрицы вероятностей вычисляемыми значениями из матрицы сумм def generateMatrixProbability(self) -> None: for i in range(self.matrixAmounts.shape[0]): - rowSum=sum(self.matrixAmounts.iloc[i]) - self.matrixProbability.iloc[i]['up'] = (self.matrixAmounts.iloc[i]['up'] / rowSum) + print(self.matrixAmounts) + 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]['down'] = self.matrixAmounts.iloc[i]['down'] / rowSum diff --git a/market_trade/tests/test_decision.py b/market_trade/tests/test_decision.py index 55cfc64..de5b98a 100644 --- a/market_trade/tests/test_decision.py +++ b/market_trade/tests/test_decision.py @@ -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)) \ No newline at end of file +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) \ No newline at end of file