Mercurial > hg > vamp-tempogram
diff NoveltyCurveProcessor.cpp @ 24:957b83524c06
* Replacing loop unsigned ints with ints
author | Carl Bussey <c.bussey@se10.qmul.ac.uk> |
---|---|
date | Tue, 19 Aug 2014 18:20:26 +0100 |
parents | 7d36c742a183 |
children | fe23998968b4 |
line wrap: on
line diff
--- a/NoveltyCurveProcessor.cpp Tue Aug 19 17:40:10 2014 +0100 +++ b/NoveltyCurveProcessor.cpp Tue Aug 19 18:20:26 2014 +0100 @@ -113,13 +113,14 @@ } //half rectification (set negative to zero) -void NoveltyCurveProcessor::halfWaveRectify(SpectrogramTransposed &spectrogramTransposed) const +void NoveltyCurveProcessor::halfWaveRectify(Spectrogram &spectrogram) const { - int numberOfBlocks = spectrogramTransposed[0].size(); + int length = spectrogram.size(); + int height = spectrogram[0].size(); - for (int block = 0; block < numberOfBlocks; block++){ - for (int k = 0; k < (int)m_blockSize; k++){ - if (spectrogramTransposed[k][block] < 0.0) spectrogramTransposed[k][block] = 0.0; + for (int i = 0; i < length; i++){ + for (int j = 0; j < height; j++){ + if (spectrogram[i][j] < 0.0) spectrogram[i][j] = 0.0; } } } @@ -140,7 +141,7 @@ if(normaliseScale != 0.0) spectrogramTransposed[k][block] /= normaliseScale; //normalise } } - + //smooted differentiator smoothedDifferentiator(spectrogramTransposed, 5); //make smoothLength a parameter! //halfwave rectification