Mercurial > hg > nnls-chroma
comparison NNLSBase.cpp @ 172:d95c4cdef8af
Merge
author | Chris Cannam |
---|---|
date | Mon, 02 Nov 2015 11:32:30 +0000 |
parents | ba9310bcc3fc a85e745c0721 |
children |
comparison
equal
deleted
inserted
replaced
171:7de720f503a5 | 172:d95c4cdef8af |
---|---|
465 if (cumenergy < energysum * m_rollon / 100) magnitude[iBin-2] = 0; | 465 if (cumenergy < energysum * m_rollon / 100) magnitude[iBin-2] = 0; |
466 else break; | 466 else break; |
467 } | 467 } |
468 } | 468 } |
469 | 469 |
470 if (maxmag < 2) { | 470 if (maxmag < m_blockSize * 2.0 / 16384.0) { // this is not quite right, I think |
471 // cerr << "timestamp " << timestamp << ": very low magnitude, setting magnitude to all zeros" << endl; | 471 // cerr << "timestamp " << timestamp << ": very low magnitude, setting magnitude to all zeros" << endl; |
472 for (int iBin = 0; iBin < static_cast<int>(m_blockSize/2); iBin++) { | 472 for (int iBin = 0; iBin < static_cast<int>(m_blockSize/2); iBin++) { |
473 magnitude[iBin] = 0; | 473 magnitude[iBin] = 0; |
474 } | 474 } |
475 } | 475 } |