comparison src/scalar.c @ 225:62e797c2974a

correction to xtract_odd_even_ratio

     return XTRACT_SUCCESS;
 }
 
 int xtract_spectral_inharmonicity(const double *data, const int N, const void *argv, double *result)
 {
-
     int n = N >> 1, h = 0;
     double num = 0.0, den = 0.0, fund;
     const double *freqs, *amps;
 
     fund = *(double *)argv;

 
 }
 
 int xtract_odd_even_ratio(const double *data, const int N, const void *argv, double *result)
 {
-
-    int M = (N >> 1), n;
-
-    double odd = 0.0, even = 0.0,  temp;
-
-    for(n = 0; n < M; n++)
+    int n = N >> 1, h = 0;
+    double odd = 0.0, even = 0.0, fund, temp;
+    const double *freqs;
+
+    fund = *(double *)argv;
+    freqs = data + n;
+
+    while(n--)
     {
         if((temp = data[n]))
         {
-            if(XTRACT_IS_ODD(n))
+            h = round(freqs[n] / fund);
+            if(XTRACT_IS_ODD(h))
             {
                 odd += temp;
             }
             else
             {