# HG changeset patch # User matthiasm # Date 1291299087 -32400 # Node ID 12cdf228c47dc899d49e216c574e0bf0068a81a7 # Parent a76598852303736e84dacbd1a3ad4b6e24f7c127 limiting magnitude diff -r a76598852303 -r 12cdf228c47d NNLSBase.cpp --- a/NNLSBase.cpp Thu Dec 02 22:24:20 2010 +0900 +++ b/NNLSBase.cpp Thu Dec 02 23:11:27 2010 +0900 @@ -447,7 +447,8 @@ float maxmag = -10000; for (size_t iBin = 0; iBin < m_blockSize/2; iBin++) { magnitude[iBin] = sqrt(fbuf[2 * iBin] * fbuf[2 * iBin] + - fbuf[2 * iBin + 1] * fbuf[2 * iBin + 1]); + fbuf[2 * iBin + 1] * fbuf[2 * iBin + 1]); + if (magnitude[iBin]>m_blockSize*1.0) magnitude[iBin] = m_blockSize; if (maxmag < magnitude[iBin]) maxmag = magnitude[iBin]; if (m_rollon > 0) { energysum += pow(magnitude[iBin],2);