# HG changeset patch # User Carl Bussey # Date 1408549734 -3600 # Node ID a3a37c8dcee7ee3e16a0a694d99a760d63b1292b # Parent ff6110f1144b9fa6ee083fb0a9c5c0a50f9cd556 * Fixed bug causing ACT not to work diff -r ff6110f1144b -r a3a37c8dcee7 AutocorrelationProcessor.cpp --- a/AutocorrelationProcessor.cpp Wed Aug 20 16:32:52 2014 +0100 +++ b/AutocorrelationProcessor.cpp Wed Aug 20 16:48:54 2014 +0100 @@ -48,13 +48,13 @@ { vector autocorrelation; - int N = m_windowLength/m_lagIncrement; + int N = m_windowLength; for (int lag = 0; lag < N; lag++){ float sum = 0; - for (int n = 0; n < (int)m_windowLength-lag; n++){ - sum += m_blockInput[lag]*m_blockInput[n+lag]; + for (int n = 0; n < N-lag; n++){ + sum += m_blockInput[n]*m_blockInput[n+lag]; } autocorrelation.push_back(sum/(2*N + 1 - lag)); } diff -r ff6110f1144b -r a3a37c8dcee7 AutocorrelationProcessor.h --- a/AutocorrelationProcessor.h Wed Aug 20 16:32:52 2014 +0100 +++ b/AutocorrelationProcessor.h Wed Aug 20 16:48:54 2014 +0100 @@ -22,7 +22,6 @@ private: size_t m_windowLength; unsigned int m_hopSize; - unsigned int m_lagIncrement; float * m_blockInput; std::vector processBlock() const;