Mercurial > hg > libxtract

changeset 245:8fc9a0462c6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some fixes to scalar.c so they work in MSVC
author Sean Enderby <sean.enderby@gmail.com>
date Thu, 12 Jun 2014 09:22:34 +0100
parents 8c768f32a6a8
children bde5fa8692ff
files src/scalar.c
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/scalar.c	Fri Jun 06 09:55:01 2014 +0100
+++ b/src/scalar.c	Thu Jun 12 09:22:34 2014 +0100
@@ -313,7 +313,7 @@
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             if(h == 1)
                 p1 += temp;
         }
@@ -347,7 +347,7 @@
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             switch (h)
             {
                 case 2:
@@ -396,7 +396,7 @@
         if((temp = data[i]))
         {
             den += temp;
-            h = round(freqs[i] / fund);
+            h = floor(freqs[i] / fund + 0.5);
             if(h >= 5)
                 num += temp;
         }
@@ -649,7 +649,7 @@
     {
         if(amps[n])
         {
-            h = round(freqs[n] / fund);
+            h = floor(freqs[n] / fund + 0.5);
             num += fabs(freqs[n] - h * fund) * XTRACT_SQ(amps[n]);
             den += XTRACT_SQ(amps[n]);
         }
@@ -681,7 +681,7 @@
     {
         if((temp = data[n]))
         {
-            h = round(freqs[n] / fund);
+            h = floor(freqs[n] / fund + 0.5);
             if(XTRACT_IS_ODD(h))
             {
                 odd += temp;
@@ -842,6 +842,8 @@
         return XTRACT_NO_RESULT;
     }
 
+    peak_index = 0;
+
     tempProduct = peak = 0;
     for (i = 0; i < M; ++i)
     {