From 624071fd63793769fddeae811db4ade4787a6f95 Mon Sep 17 00:00:00 2001 From: robot Date: Tue, 26 Dec 2017 16:04:08 -0800 Subject: [PATCH] Changed distribution keyword, casted some attributes to float, removed setting list --- src/nupic/algorithms/anomaly_likelihood.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/nupic/algorithms/anomaly_likelihood.py b/src/nupic/algorithms/anomaly_likelihood.py index 88c6903f3b..a9226c4038 100644 --- a/src/nupic/algorithms/anomaly_likelihood.py +++ b/src/nupic/algorithms/anomaly_likelihood.py @@ -318,15 +318,12 @@ def write(self, proto): record.anomalyScore = float(anomalyScore) if self._distribution: - proto.distribution.name = self._distribution["distributionParams"]["name"] - proto.distribution.mean = self._distribution["distributionParams"]["mean"] - proto.distribution.variance = self._distribution["distributionParams"]\ - ["variance"] - proto.distribution.stdev = self._distribution["distributionParams"]\ - ["stdev"] + proto.distribution.name = self._distribution["distribution"]["name"] + proto.distribution.mean = float(self._distribution["distribution"]["mean"]) + proto.distribution.variance = float(self._distribution["distribution"]["variance"]) + proto.distribution.stdev = float(self._distribution["distribution"]["stdev"]) - proto.distribution.movingAverage.windowSize = self._distribution\ - ["movingAverage"]["windowSize"] + proto.distribution.movingAverage.windowSize = self._distribution["movingAverage"]["windowSize"] historicalValues = self._distribution["movingAverage"]["historicalValues"] pHistValues = proto.distribution.movingAverage.init( @@ -334,10 +331,7 @@ def write(self, proto): for i, value in enumerate(historicalValues): pHistValues[i] = float(value) - proto.distribution.movingAverage.historicalValues = self._distribution\ - ["movingAverage"]["historicalValues"] - proto.distribution.movingAverage.total = self._distribution\ - ["movingAverage"]["total"] + proto.distribution.movingAverage.total = float(self._distribution["movingAverage"]["total"]) historicalLikelihoods = self._distribution["historicalLikelihoods"] pHistLikelihoods = proto.distribution.init("historicalLikelihoods",