comparison dsp/onsets/DetectionFunction.cpp @ 499:af5b7ef02aa7

Style fixes: avoid unsigned, fix formatting

 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-DetectionFunction::DetectionFunction( DFConfig Config ) :
+DetectionFunction::DetectionFunction( DFConfig config ) :
     m_window(0)
 {
     m_magHistory = NULL;
     m_phaseHistory = NULL;
     m_phaseHistoryOld = NULL;
     m_magPeaks = NULL;
 
-    initialise( Config );
+    initialise( config );
 }
 
 DetectionFunction::~DetectionFunction()
 {
     deInitialise();

     return runDF();
 }
 
 void DetectionFunction::whiten()
 {
-    for (unsigned int i = 0; i < m_halfLength; ++i) {
+    for (int i = 0; i < m_halfLength; ++i) {
         double m = m_magnitude[i];
         if (m < m_magPeaks[i]) {
             m = m + (m_magPeaks[i] - m) * m_whitenRelaxCoeff;
         }
         if (m < m_whitenFloor) m = m_whitenFloor;

     }
         
     return retVal;
 }
 
-double DetectionFunction::HFC(unsigned int length, double *src)
-{
-    unsigned int i;
-    double val = 0;
-
-    for( i = 0; i < length; i++) {
+double DetectionFunction::HFC(int length, double *src)
+{
+    double val = 0;
+    for (int i = 0; i < length; i++) {
         val += src[ i ] * ( i + 1);
     }
     return val;
 }
 
-double DetectionFunction::specDiff(unsigned int length, double *src)
-{
-    unsigned int i;
+double DetectionFunction::specDiff(int length, double *src)
+{
     double val = 0.0;
     double temp = 0.0;
     double diff = 0.0;
 
-    for( i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
         
         temp = fabs( (src[ i ] * src[ i ]) - (m_magHistory[ i ] * m_magHistory[ i ]) );
                 
         diff= sqrt(temp);
 

 
     return val;
 }
 
 
-double DetectionFunction::phaseDev(unsigned int length, double *srcPhase)
-{
-    unsigned int i;
+double DetectionFunction::phaseDev(int length, double *srcPhase)
+{
     double tmpPhase = 0;
     double tmpVal = 0;
     double val = 0;
 
     double dev = 0;
 
-    for( i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
         tmpPhase = (srcPhase[ i ]- 2*m_phaseHistory[ i ]+m_phaseHistoryOld[ i ]);
         dev = MathUtilities::princarg( tmpPhase );
 
         // A previous version of this code only counted the value here
         // if the magnitude exceeded 0.1.  My impression is that

         
     return val;
 }
 
 
-double DetectionFunction::complexSD(unsigned int length, double *srcMagnitude, double *srcPhase)
-{
-    unsigned int i;
+double DetectionFunction::complexSD(int length, double *srcMagnitude, double *srcPhase)
+{
     double val = 0;
     double tmpPhase = 0;
     double tmpReal = 0;
     double tmpImag = 0;
    
     double dev = 0;
     ComplexData meas = ComplexData( 0, 0 );
     ComplexData j = ComplexData( 0, 1 );
 
-    for( i = 0; i < length; i++) {
+    for (int i = 0; i < length; i++) {
         
         tmpPhase = (srcPhase[ i ]- 2*m_phaseHistory[ i ]+m_phaseHistoryOld[ i ]);
         dev= MathUtilities::princarg( tmpPhase );
                 
         meas = m_magHistory[i] - ( srcMagnitude[ i ] * exp( j * dev) );

     }
 
     return val;
 }
 
-double DetectionFunction::broadband(unsigned int length, double *src)
-{
-    double val = 0;
-    for (unsigned int i = 0; i < length; ++i) {
+double DetectionFunction::broadband(int length, double *src)
+{
+    double val = 0;
+    for (int i = 0; i < length; ++i) {
         double sqrmag = src[i] * src[i];
         if (m_magHistory[i] > 0.0) {
             double diff = 10.0 * log10(sqrmag / m_magHistory[i]);
             if (diff > m_dbRise) val = val + 1;
         }