From c5df53ed525db899f8235681e9c1678646208b67 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 10 Jul 2013 11:26:39 -0700 Subject: [PATCH] fix cast to 0 for long long in SimpleMovingAverage --- libraries/shared/src/SimpleMovingAverage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/shared/src/SimpleMovingAverage.cpp b/libraries/shared/src/SimpleMovingAverage.cpp index df41433618..5a55486216 100644 --- a/libraries/shared/src/SimpleMovingAverage.cpp +++ b/libraries/shared/src/SimpleMovingAverage.cpp @@ -22,7 +22,7 @@ int SimpleMovingAverage::updateAverage(float sample) { if (_numSamples > 0) { _average = (ONE_MINUS_WEIGHTING * _average) + (WEIGHTING * sample); - float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000; + float eventDelta = (usecTimestampNow() - _lastEventTimestamp) / 1000000.0f; if (_numSamples > 1) { _eventDeltaAverage = (ONE_MINUS_WEIGHTING * _eventDeltaAverage) + @@ -46,7 +46,7 @@ void SimpleMovingAverage::reset() { float SimpleMovingAverage::getEventDeltaAverage() { return (ONE_MINUS_WEIGHTING * _eventDeltaAverage) + - (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000)); + (WEIGHTING * ((usecTimestampNow() - _lastEventTimestamp) / 1000000.0f)); } float SimpleMovingAverage::getAverageSampleValuePerSecond() {