diff options
Diffstat (limited to 'src/signalProcessing/fft/zfftma.c')
| -rw-r--r-- | src/signalProcessing/fft/zfftma.c | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/src/signalProcessing/fft/zfftma.c b/src/signalProcessing/fft/zfftma.c index 66573455..ee7f638f 100644 --- a/src/signalProcessing/fft/zfftma.c +++ b/src/signalProcessing/fft/zfftma.c @@ -1,7 +1,7 @@ /* * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab * Copyright (C) 2008 - INRIA - Allan SIMON - * + * * This file must be used under the terms of the CeCILL. * This source file is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -17,7 +17,7 @@ #include "fft.h" #include "lapack.h" #include "fft_internal.h" - +#include <stdio.h> void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { @@ -32,16 +32,19 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) int ierr = 0 ; int isn = -1; int i = 0; + + int increment=1; double* realIn = (double*) malloc ( sizeof (double) * (unsigned int) size ); double* imagIn = (double*) malloc ( sizeof (double) * (unsigned int) size ); - + doubleComplex* inCopy = (doubleComplex*) malloc ( sizeof (doubleComplex) * (unsigned int) size); doubleComplex* inTemp = (doubleComplex*) malloc ( sizeof (doubleComplex) * (unsigned int) size ); zimaga ( in , size , imagIn) ; zreala ( in , size , realIn) ; + for(i=0;i<size;i++) inCopy[i]=in[i]; if ( rows == 1 || cols == 1 ) { @@ -50,7 +53,7 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { if ( size <= pow ( 2 , 15 )) { - fft842 ( in , size , 0 ); + fft842 ( inCopy , size , 0 ); choosenAlgo = FFT842 ; } else @@ -65,26 +68,39 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) } else { - rowsTemp = (int) pow ( 2 ,(int ) log( rows + 0.5) /log ( 2 )) ; - colsTemp = (int) pow ( 2 ,(int ) log( cols + 0.5) /log ( 2 )) ; + rowsTemp = (int) pow ( 2 ,(int ) (log( rows + 0.5) /log ( 2 ))) ; + colsTemp = (int) pow ( 2 ,(int ) (log( cols + 0.5) /log ( 2 ))) ; + if ( rows == rowsTemp) { if ( rows <= pow ( 2 , 15 )) { for ( i = 0 ; i < cols ; i++ ) { - fft842 ( &in[ rows*i] , rows , 0); - choosenAlgo = FFT842 ; + fft842 ( &inCopy[ rows*i] , rows , 0); + /* stock new inCopy in realIn and imagIn + if the second call don't call fft842 + ex : matrix 2*3 */ + zimaga ( inCopy , size , imagIn) ; + zreala ( inCopy , size , realIn) ; } } else { dfft2 ( realIn, imagIn ,cols , rows , 1 , isn , ierr); - } + /* stock new realIn and imagIn in inCopy + if the second call call fft842 + ex : matrix 3*2 */ + inCopy=DoubleComplexMatrix(realIn,imagIn,size); + } } else { dfft2 ( realIn, imagIn ,cols , rows , 1 , isn , ierr); + /* stock new realIn and imagIn in inCopy + if the second call call fft842 + ex : matrix 3*2 */ + inCopy=DoubleComplexMatrix(realIn,imagIn,size); } /*second call*/ if ( colsTemp == cols ) @@ -94,11 +110,11 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) /*compute the fft on each line of the matrix */ for (i = 0 ; i < rows ; i++ ) { - C2F(zcopy) ( cols, in + i, rows, inTemp , 1 ); + C2F(zcopy) ( &cols, inCopy + i, &rows, inTemp , &increment ); fft842( inTemp , cols , 0); choosenAlgo = FFT842 ; - C2F(zcopy) ( cols, inTemp , 1, in + i, rows ); + C2F(zcopy) ( &cols, inTemp , &increment, inCopy + i, &rows ); } } @@ -106,7 +122,7 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { dfft2 ( realIn, imagIn, 1, cols, rows, isn, ierr); } - } + } else { dfft2 ( realIn, imagIn, 1, cols, rows, isn, ierr); @@ -120,7 +136,7 @@ void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out) { for ( i = 0 ; i < size ; i++) { - out[i] = DoubleComplex ( zreals(in[i]) , zimags(in[i]) ); + out[i] = DoubleComplex ( zreals(inCopy[i]) , zimags(inCopy[i]) ); } } else |