Mercurial > hg > libxtract

changeset 224:5ca682ce3392

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/jamiebullock/LibXtract
author Sean Enderby <sean.enderby@gmail.com>
date Mon, 24 Feb 2014 13:43:13 +0000
parents fdbef1474be9 (diff) ae2225b96ae1 (current diff)
children 62e797c2974a
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/scalar.c	Sun Feb 23 21:32:14 2014 +0000
+++ b/src/scalar.c	Mon Feb 24 13:43:13 2014 +0000
@@ -623,7 +623,7 @@
 int xtract_spectral_inharmonicity(const double *data, const int N, const void *argv, double *result)
 {
 
-    int n = N >> 1;
+    int n = N >> 1, h = 0;
     double num = 0.0, den = 0.0, fund;
     const double *freqs, *amps;
 
@@ -635,7 +635,8 @@
     {
         if(amps[n])
         {
-            num += fabs(freqs[n] - n * fund) * XTRACT_SQ(amps[n]);
+            h = round(freqs[n] / fund);
+            num += fabs(freqs[n] - h * fund) * XTRACT_SQ(amps[n]);
             den += XTRACT_SQ(amps[n]);
         }
     }