comparison FChTransformUtils.cpp @ 10:af59167b3d35 perf

size_t -> int throughout: permits better optimisation for tight for-loops, making the whole thing about 10% faster

 
 
 #include "FChTransformUtils.h"
 #include <math.h>
 
-void cumtrapz(const double *x, const double *y, size_t N, double *accum)
+void cumtrapz(const double *x, const double *y, int N, double *accum)
 /*Trapezoidal Integrator: 1/2(b-a)(F(a)+F(b))*/
 {
     accum[0]=0.0;
-    for (size_t i = 1; i < N; i++) {
+    for (int i = 1; i < N; i++) {
         accum[i]=accum[i-1]+0.5*(x[i]-x[i-1])*(y[i]+y[i-1]);
     }
 }
 
 
-void interp1(const double *x1, const double *y1, size_t N1, const double *x2, double *y2, size_t N2){
+void interp1(const double *x1, const double *y1, int N1, const double *x2, double *y2, int N2){
 /*1-D linear interpolation*/
 
-    for (size_t i = 0; i < N2; i++) {
+    for (int i = 0; i < N2; i++) {
         /*Smaller or equal than the smallest, or larger or equal than the largest.*/
         if ( x2[i] <= x1[0] ) {
             y2[i] = y1[0];
         } else if ( x2[i] >= x1[N1-1] ) {
             y2[i] = y1[N1-1];
         } else {
             /*Search every value of x2 in x1*/
-            size_t j = 1;
-            size_t salir = 0;
+            int j = 1;
+            int salir = 0;
             while ((j<N1)&&(!salir)) {			
                 if ( x2[i] <= x1[j] ) {
-                    //y2[i] = ( x2[i]*( y1[j] - y1[j-1] ) + x1[j]*y1[j-1] - x1[j-1]*y1[j] ) / ( x1[j] - x1[j-1] );
                     y2[i] = y1[j-1] + ( ( y1[j] - y1[j-1] )*(x2[i] - x1[j-1] ) )/ ( x1[j] - x1[j-1] );
                     salir = 1;
                 } // if
                 j++;
             } // for
         } // else
     } // for
 
 }
 
-void interp1q(const double *y1, const size_t *x2_int, const double *x2_frac, double *y2, size_t N2){
+void interp1q(const double *y1, const int *x2_int, const double *x2_frac, double *y2, int N2){
 
-    for(size_t i=0;i<N2;i++){
+    for(int i=0;i<N2;i++){
         y2[i] = y1[x2_int[i]]*(1.0-x2_frac[i])+y1[x2_int[i]+1]*x2_frac[i];
     } // for
 
 }
 
-void hanning_window(double *p_window, size_t n, bool normalize) {
+void hanning_window(double *p_window, int n, bool normalize) {
 
     double accum=0;
-    for (size_t i = 0; i < n; i++) {
+    for (int i = 0; i < n; i++) {
         p_window[i] = 0.5*(1.0-cos(2*M_PI*(double)(i+1)/((double)n+1.0)));
         accum += p_window[i];
     }
     if (normalize) {
-    	for (size_t i = 0; i < n; i++) { //window normalization
+    	for (int i = 0; i < n; i++) { //window normalization
             p_window[i] = p_window[i]/accum;
     	}
     }
 
 }