diff options
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/Makefile.in | 4 | ||||
-rwxr-xr-x | src/configure | 12 | ||||
-rw-r--r-- | src/configure.ac | 3 | ||||
-rw-r--r-- | src/matrixOperations/includes/matrixTranspose.h | 32 | ||||
-rw-r--r-- | src/signalProcessing/includes/fft.h | 19 | ||||
-rw-r--r-- | src/signalProcessing/includes/ifft.h | 17 |
7 files changed, 75 insertions, 16 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3b24bad8..231d926c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,4 +19,6 @@ SUBDIRS= lib/blas \ statisticsFunctions \ matrixOperations \ implicitList \ - string + string \ + ifft \ + signalProcessing diff --git a/src/Makefile.in b/src/Makefile.in index c10051ac..7da93269 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -190,7 +190,9 @@ SUBDIRS = lib/blas \ statisticsFunctions \ matrixOperations \ implicitList \ - string + string \ + ifft \ + signalProcessing all: all-recursive diff --git a/src/configure b/src/configure index db0ebe76..a52abbee 100755 --- a/src/configure +++ b/src/configure @@ -21892,14 +21892,7 @@ fi ###################### ######## With GCC ... ###################### -if test "$CC" = "gcc"; then CFLAGS="$CFLAGS" - # used to be -O - # -D_FORTIFY_SOURCE=2 -else - ## CC compiler (not GCC) - CFLAGS="-g" -fi ############################################################## @@ -22156,7 +22149,7 @@ fi #operations/multiplication/Makefile #operations/division/Makefile -ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile matrixOperations/Makefile matrixOperations/addition/Makefile matrixOperations/subtraction/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile implicitList/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile" +ac_config_files="$ac_config_files Makefile lib/blas/Makefile lib/lapack/Makefile type/Makefile operations/Makefile operations/addition/Makefile operations/subtraction/Makefile matrixOperations/Makefile matrixOperations/addition/Makefile matrixOperations/subtraction/Makefile matrixOperations/multiplication/Makefile matrixOperations/division/Makefile matrixOperations/cat/Makefile matrixOperations/transpose/Makefile matrixOperations/trace/Makefile matrixOperations/hilbert/Makefile matrixOperations/expm/Makefile matrixOperations/eye/Makefile matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile implicitList/Makefile ifft/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile elementaryFunctions/acos/Makefile elementaryFunctions/acosh/Makefile elementaryFunctions/sin/Makefile elementaryFunctions/sinh/Makefile elementaryFunctions/asin/Makefile elementaryFunctions/asinh/Makefile elementaryFunctions/tan/Makefile elementaryFunctions/tanh/Makefile elementaryFunctions/atan/Makefile elementaryFunctions/atan2/Makefile elementaryFunctions/atanh/Makefile elementaryFunctions/log/Makefile elementaryFunctions/log1p/Makefile elementaryFunctions/log10/Makefile elementaryFunctions/exp/Makefile elementaryFunctions/exp10/Makefile elementaryFunctions/sqrt/Makefile elementaryFunctions/lnp1m1/Makefile elementaryFunctions/pow/Makefile auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/Makefile auxiliaryFunctions/frexp/Makefile auxiliaryFunctions/isempty/Makefile auxiliaryFunctions/isnan/Makefile auxiliaryFunctions/rand/Makefile auxiliaryFunctions/sign/Makefile auxiliaryFunctions/size/Makefile auxiliaryFunctions/length/Makefile auxiliaryFunctions/type/Makefile auxiliaryFunctions/pythag/Makefile auxiliaryFunctions/conj/Makefile statisticsFunctions/Makefile statisticsFunctions/mean/Makefile statisticsFunctions/sum/Makefile statisticsFunctions/variance/Makefile string/Makefile string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile signalProcessing/ifft/Makefile signalProcessing/includes/Makefile" @@ -22789,6 +22782,7 @@ do "matrixOperations/infiniteNorm/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/infiniteNorm/Makefile" ;; "matrixOperations/inversion/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/inversion/Makefile" ;; "implicitList/Makefile") CONFIG_FILES="$CONFIG_FILES implicitList/Makefile" ;; + "ifft/Makefile") CONFIG_FILES="$CONFIG_FILES ifft/Makefile" ;; "elementaryFunctions/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/Makefile" ;; "elementaryFunctions/cos/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/cos/Makefile" ;; "elementaryFunctions/cosh/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/cosh/Makefile" ;; @@ -22833,6 +22827,8 @@ do "string/string/Makefile") CONFIG_FILES="$CONFIG_FILES string/string/Makefile" ;; "signalProcessing/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/Makefile" ;; "signalProcessing/fft/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/fft/Makefile" ;; + "signalProcessing/ifft/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/ifft/Makefile" ;; + "signalProcessing/includes/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/includes/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/src/configure.ac b/src/configure.ac index bcacd297..22f3f9b1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -178,6 +178,7 @@ matrixOperations/ones/Makefile matrixOperations/infiniteNorm/Makefile matrixOperations/inversion/Makefile implicitList/Makefile +ifft/Makefile elementaryFunctions/Makefile elementaryFunctions/cos/Makefile elementaryFunctions/cosh/Makefile @@ -222,6 +223,8 @@ string/disp/Makefile string/string/Makefile signalProcessing/Makefile signalProcessing/fft/Makefile +signalProcessing/ifft/Makefile +signalProcessing/includes/Makefile ]) diff --git a/src/matrixOperations/includes/matrixTranspose.h b/src/matrixOperations/includes/matrixTranspose.h index df160db5..429e8303 100644 --- a/src/matrixOperations/includes/matrixTranspose.h +++ b/src/matrixOperations/includes/matrixTranspose.h @@ -16,13 +16,37 @@ #include "floatComplex.h" #include "doubleComplex.h" #include <math.h> - +/* +** \brief Compute the transpose of a float matrix. +** \param in : input matrix. +** \param lines1 : number of lines +** \param column1 : number of column1 +** \param out : the transposed float matrix. +*/ void stransposea ( float* in , int lines1 , int column1, float* out ); - +/* +** \brief Compute the transpose of a double matrix. +** \param in : input matrix. +** \param lines1 : number of lines +** \param column1 : number of column1 +** \param out : the transposed double matrix. +*/ void dtransposea ( double* in , int lines1 , int column1, double* out ); - +/* +** \brief Compute the transpose of a float complex matrix. +** \param in : input matrix. +** \param lines1 : number of lines +** \param column1 : number of column1 +** \param out : the transposed float complex matrix. +*/ void ctransposea ( floatComplex* in , int lines1 , int column1, floatComplex* out ); - +/* +** \brief Compute the transpose of a double complex matrix. +** \param in : input matrix. +** \param lines1 : number of lines +** \param column1 : number of column1 +** \param out : the transposed double complex matrix. +*/ void ztransposea ( doubleComplex* in , int lines1 , int column1, doubleComplex* out ); #endif /* !__MATRIXTRANSPOSE_H__ */ diff --git a/src/signalProcessing/includes/fft.h b/src/signalProcessing/includes/fft.h index da88d709..3766639b 100644 --- a/src/signalProcessing/includes/fft.h +++ b/src/signalProcessing/includes/fft.h @@ -20,9 +20,24 @@ #include "lapack.h" #include "fft_internal.h" -void cfftma ( floatComplex* in , int rows, int cols, floatComplex* out); -void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out); +/* +** compute the fast fourier transform of a vector +** param in : the input matrix in complex float precision +** param rows: number of rows of the input matrix +** param cols: number of cols of the input matrix +** param out : the transformed matrix in complex float precision +*/ + void cfftma ( floatComplex* in , int rows, int cols, floatComplex* out); +/* +** compute the fast fourier transform of a vector +** param in : the input matrix in complex double precision +** param rows: number of rows of the input matrix +** param cols: number of cols of the input matrix +** param out : the transformed matrix in complex double precision +*/ +void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out); + #endif /* !__FFT_H__ */ diff --git a/src/signalProcessing/includes/ifft.h b/src/signalProcessing/includes/ifft.h index 3ba39485..5f698a5b 100644 --- a/src/signalProcessing/includes/ifft.h +++ b/src/signalProcessing/includes/ifft.h @@ -20,7 +20,24 @@ #include "lapack.h" #include "fft_internal.h" +/* +** compute the inverse fast fourier transform of a vector +** param in : the input matrix in complex double precision +** param rows: number of rows of the input matrix +** param cols: number of cols of the input matrix +** param out : the transformed matrix in complex double precision +*/ + + void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out); +/* +** compute the inverse fast fourier transform of a vector +** param in : the input matrix in complex float precision +** param rows: number of rows of the input matrix +** param cols: number of cols of the input matrix +** param out : the transformed matrix in complex float precision +*/ + void cifftma ( floatComplex* in , int rows, int cols, floatComplex* out); |