comparison NoveltyCurveProcessor.cpp @ 24:957b83524c06

* Replacing loop unsigned ints with ints

         smoothFilter.process(&spectrogramTransposed[i][0], diffHannWindow, &spectrogramTransposed[i][0], FIRFilter::middle);
     }
 }
 
 //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;
         }
     }
 }
 
 //process method

         for (int k = 0; k < (int)m_blockSize; k++){
             spectrogramTransposed[k][block] = log(1+m_compressionConstant*spectrogram[block][k]);
             if(normaliseScale != 0.0) spectrogramTransposed[k][block] /= normaliseScale; //normalise
         }
     }
-
+    
     //smooted differentiator
     smoothedDifferentiator(spectrogramTransposed, 5); //make smoothLength a parameter!
     //halfwave rectification
     halfWaveRectify(spectrogramTransposed);