From 57962d8347d6cc51f152fdc1325c78cddd692b50 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 16 Apr 2019 07:59:04 +0200 Subject: [PATCH] dsp: simplified moving average window --- ...moving_average.hpp => moving_average_window.hpp} | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) rename common/include/villas/dsp/{moving_average.hpp => moving_average_window.hpp} (88%) diff --git a/common/include/villas/dsp/moving_average.hpp b/common/include/villas/dsp/moving_average_window.hpp similarity index 88% rename from common/include/villas/dsp/moving_average.hpp rename to common/include/villas/dsp/moving_average_window.hpp index 22d183fb6..f6b6c29f2 100644 --- a/common/include/villas/dsp/moving_average.hpp +++ b/common/include/villas/dsp/moving_average_window.hpp @@ -1,4 +1,4 @@ -/** A moving average filter. +/** A moving average window. * * @file * @author Steffen Vogel @@ -23,13 +23,13 @@ #pragma once -#include +#include namespace villas { namespace dsp { template -class MovingAverage { +class MovingAverageWindow { public: typedef typename Window::size_type size_type; @@ -37,14 +37,11 @@ public: protected: Window window; - size_type length; - T state; public: - MovingAverage(size_type len, T i) : + MovingAverageWindow(size_type len, T i = 0) : window(len, i), - length(len), state(i) { } @@ -55,7 +52,7 @@ public: state += in; state -= out; - return state / len; + return state / window.getSteps(); } };