comparison src/BTrack.cpp @ 111:8fb1610c9192

Code style updates

 }
 
 //=======================================================================
 BTrack::BTrack (int hop)
  :  odf (hop, 2 * hop, ComplexSpectralDifferenceHWR, HanningWindow)
-{	
+{
     initialise (hop);
 }
 
 //=======================================================================
 BTrack::BTrack (int hop, int frame)

 	double t_mu = 41/2;
 	double m_sig;
 	double x;
 	// create tempo transition matrix
 	m_sig = 41/8;
-	for (int i = 0;i < 41;i++)
-	{
-		for (int j = 0;j < 41;j++)
-		{
-			x = j+1;
-			t_mu = i+1;
-			tempoTransitionMatrix[i][j] = (1 / (m_sig * sqrt (2 * M_PI))) * exp( (-1*pow((x-t_mu),2)) / (2*pow(m_sig,2)) );
+    
+	for (int i = 0; i < 41; i++)
+	{
+		for (int j = 0; j < 41; j++)
+		{
+			x = j + 1;
+			t_mu = i + 1;
+			tempoTransitionMatrix[i][j] = (1 / (m_sig * sqrt (2 * M_PI))) * exp((-1 * pow ((x - t_mu), 2)) / (2 * pow (m_sig, 2)) );
 		}
 	}
 	
 	// tempo is not fixed
 	tempoFixed = false;

 {
     int onsetDetectionFunctionLength = 512;
     
 #ifdef USE_FFTW
     // copy into complex array and zero pad
-    for (int i = 0;i < FFTLengthForACFCalculation;i++)
+    for (int i = 0; i < FFTLengthForACFCalculation; i++)
     {
         if (i < onsetDetectionFunctionLength)
         {
             complexIn[i][0] = onsetDetectionFunction[i];
             complexIn[i][1] = 0.0;

     fftw_execute (acfForwardFFT);
     
     // multiply by complex conjugate
     for (int i = 0;i < FFTLengthForACFCalculation;i++)
     {
-        complexOut[i][0] = complexOut[i][0]*complexOut[i][0] + complexOut[i][1]*complexOut[i][1];
+        complexOut[i][0] = complexOut[i][0] * complexOut[i][0] + complexOut[i][1] * complexOut[i][1];
         complexOut[i][1] = 0.0;
     }
     
     // perform the ifft
     fftw_execute (acfBackwardFFT);
     
 #endif
     
 #ifdef USE_KISS_FFT
     // copy into complex array and zero pad
-    for (int i = 0;i < FFTLengthForACFCalculation;i++)
+    for (int i = 0; i < FFTLengthForACFCalculation; i++)
     {
         if (i < onsetDetectionFunctionLength)
         {
             fftIn[i].r = onsetDetectionFunction[i];
             fftIn[i].i = 0.0;

     
     for (int i = 0; i < 512; i++)
     {
 #ifdef USE_FFTW
         // calculate absolute value of result
-        double absValue = sqrt (complexIn[i][0]*complexIn[i][0] + complexIn[i][1]*complexIn[i][1]);
+        double absValue = sqrt (complexIn[i][0] * complexIn[i][0] + complexIn[i][1] * complexIn[i][1]);
 #endif
         
 #ifdef USE_KISS_FFT
         // calculate absolute value of result
         double absValue = sqrt (fftIn[i].r * fftIn[i].r + fftIn[i].i * fftIn[i].i);