jens/cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- FirComplex: Added static process()

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@105 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2014-12-22 17:36:24 +00:00
parent edbe93987d
commit 4f726e0285
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/Equalizer.hpp
+4 -4
View File
@@ -71,7 +71,7 @@ public:
void update(ComplexScalar const &e, RealScalar const &mu)
{
m_w += m_x * conj(e) * mu;
m_w += m_state * conj(e) * mu;
}
private:
@@ -97,7 +97,7 @@ public:
RealScalar x1, x2;
x1 = abs(x);
x2 = abs(m_x[m_numTaps-1]);
x2 = abs(m_state[m_numTaps-1]);
m_power = max(RealScalar(0), m_power + (x1*x1 - m_xLast));
m_xLast = x2*x2;
@@ -175,10 +175,10 @@ public:
ComplexScalar process(ComplexScalar const &xs, ComplexScalar const &xh)
{
int32_t i;
CVec &x = m_x;
CVec &x = m_state;
// x(0:size-1) = [xs, x(0:m_numFeedforward-2), xh, x(m_numFeedforward:size-2)]
m_x.reverse() << m_x.segment(m_numFeedforward-1, m_numFeedBack).reverse(),xh,m_x.segment(0, m_numFeedforward-2).reverse(),xs;
m_state.reverse() << m_state.segment(m_numFeedforward-1, m_numFeedBack).reverse(),xh,m_state.segment(0, m_numFeedforward-2).reverse(),xs;
return FirComplex::process(m_w);
}