VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

Moving average fixes

Browse Source
This commit is contained in:
f4exb 2017-01-15 11:26:11 +01:00
parent 618f302aad
commit 38337f1333
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -116,7 +116,6 @@ set(sdrbase_SOURCES
sdrbase/dsp/interpolator.cpp sdrbase/dsp/interpolator.cpp
sdrbase/dsp/hbfiltertraits.cpp sdrbase/dsp/hbfiltertraits.cpp
sdrbase/dsp/lowpass.cpp sdrbase/dsp/lowpass.cpp
sdrbase/dsp/movingaverage.cpp
sdrbase/dsp/nco.cpp sdrbase/dsp/nco.cpp
sdrbase/dsp/ncof.cpp sdrbase/dsp/ncof.cpp
sdrbase/dsp/pidcontroller.cpp sdrbase/dsp/pidcontroller.cpp

1
sdrbase/dsp/movingaverage.cpp
View File

@ -1 +0,0 @@
#include "dsp/movingaverage.h"

22
sdrbase/dsp/movingaverage.h
View File

@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <algorithm>
#include "dsp/dsptypes.h" #include "dsp/dsptypes.h"
template<class Type> class MovingAverage { template<class Type> class MovingAverage {
@ -24,11 +25,7 @@ public:
void resize(int historySize, Type initial) void resize(int historySize, Type initial)
{ {
m_history.resize(historySize); m_history.resize(historySize);
std::fill(m_history.begin(), m_history.end(), initial);
for(size_t i = 0; i < m_history.size(); i++) {
m_history[i] = initial;
}
m_sum = (Type) m_history.size() * initial; m_sum = (Type) m_history.size() * initial;
m_index = 0; m_index = 0;
} }
@ -39,19 +36,16 @@ public:
m_sum += value - oldest; m_sum += value - oldest;
oldest = value; oldest = value;
m_index++; if (m_index < m_history.size()) {
m_index++;
if(m_index >= m_history.size()) { } else {
m_index = 0; m_index = 0;
} }
} }
void fill(Type value) void fill(Type value)
{ {
for(size_t i = 0; i < m_history.size(); i++) { std::fill(m_history.begin(), m_history.end(), value);
m_history[i] = value;
}
m_sum = (Type) m_history.size() * value; m_sum = (Type) m_history.size() * value;
} }