summaryrefslogtreecommitdiff
path: root/src/signalProcessing/includes
diff options
context:
space:
mode:
authortorset2008-12-04 10:56:09 +0000
committertorset2008-12-04 10:56:09 +0000
commit3f772c99e3d8ff786e97b8f801ee405863e26934 (patch)
tree1f9bedc24b072232c133a6d35762c4c61def8d6d /src/signalProcessing/includes
parente5123f85b0e55f4cf3ffd1ea3123f324d57d1642 (diff)
downloadscilab2c-3f772c99e3d8ff786e97b8f801ee405863e26934.tar.gz
scilab2c-3f772c99e3d8ff786e97b8f801ee405863e26934.tar.bz2
scilab2c-3f772c99e3d8ff786e97b8f801ee405863e26934.zip
Add conv repertory and files
Diffstat (limited to 'src/signalProcessing/includes')
-rw-r--r--src/signalProcessing/includes/ifft.h2
-rw-r--r--src/signalProcessing/includes/levin.h42
2 files changed, 22 insertions, 22 deletions
diff --git a/src/signalProcessing/includes/ifft.h b/src/signalProcessing/includes/ifft.h
index 5f698a5b..2f857e6e 100644
--- a/src/signalProcessing/includes/ifft.h
+++ b/src/signalProcessing/includes/ifft.h
@@ -18,7 +18,7 @@
#include "doubleComplex.h"
#include "blas.h"
#include "lapack.h"
-#include "fft_internal.h"
+#include "ifft_internal.h"
/*
** compute the inverse fast fourier transform of a vector
diff --git a/src/signalProcessing/includes/levin.h b/src/signalProcessing/includes/levin.h
index 81904b7c..f2c7fd91 100644
--- a/src/signalProcessing/includes/levin.h
+++ b/src/signalProcessing/includes/levin.h
@@ -24,14 +24,14 @@ void slevina (int n, float* cov, int lCov, int cCov, float* la, float* sig, floa
/* levinUtils.c */
-void dr1(double *in,int lines,int rows, int n, double * out);
-void dr2(double *in,int lines,int rows, int n, double * out);
-void dr3(double *in,int lines,int rows, int n, double * out);
-void dr4(double *in,int lines,int rows, int n, double * out);
-void sr1(float *in,int lines,int rows, int n, float * out);
-void sr2(float *in,int lines,int rows, int n, float * out);
-void sr3(float *in,int lines,int rows, int n, float * out);
-void sr4(float *in,int lines,int rows, int n, float * out);
+void dr1(double *in,int lines,int columns, int n, double * out);
+void dr2(double *in,int lines,int columns, int n, double * out);
+void dr3(double *in,int lines,int columns, int n, double * out);
+void dr4(double *in,int lines,int columns, int n, double * out);
+void sr1(float *in,int lines,int columns, int n, float * out);
+void sr2(float *in,int lines,int columns, int n, float * out);
+void sr3(float *in,int lines,int columns, int n, float * out);
+void sr4(float *in,int lines,int columns, int n, float * out);
@@ -39,43 +39,43 @@ void sr4(float *in,int lines,int rows, int n, float * out);
/*
in1,in2 : matrices to multiply
n :
- rows : number of rows of in2
+ columns : number of columns of in2
ind_boucle : indice of the loop
out : result matrix
lines : number of lines of the result
deb_out : 0 if the result start to the indice 0, 1 otherwise
choix : 'u' or 'd', depends of in2. We take either the k first elements of in2 ('u') or the k last ('d'),
- k is a nomber which depends of the indice of loop, the rows ...
+ k is a nomber which depends of the indice of loop, the columns ...
*/
-void dlevinmul(double* in1, double* in2, int n, int rows, int ind_boucle, double* out, int lines, int deb_out,char choix);
-void dlevinmul2(double* in1, double *in2,int ind_boucle,int n,int rows,double* out);
-void slevinmul(float* in1, float* in2, int n, int rows, int ind_boucle, float* out, int lines, int deb_out,char choix);
-void slevinmul2(float* in1, float *in2,int ind_boucle,int n,int rows,float* out);
+void dlevinmul(double* in1, double* in2, int n, int columns, int ind_boucle, double* out, int lines, int deb_out,char choix);
+void dlevinmul2(double* in1, double *in2,int ind_boucle,int n,int columns,double* out);
+void slevinmul(float* in1, float* in2, int n, int columns, int ind_boucle, float* out, int lines, int deb_out,char choix);
+void slevinmul2(float* in1, float *in2,int ind_boucle,int n,int columns,float* out);
/*take the values of sig wanted*/
-void dlevinsig(double *sig,int n, int rows, int lines, double *sig1);
-void slevinsig(float *sig,int n, int rows, int lines, float *sig1);
+void dlevinsig(double *sig,int n, int columns, int lines, double *sig1);
+void slevinsig(float *sig,int n, int columns, int lines, float *sig1);
/*a subtraction used in levin program, is different from the classic subtraction cause of the indices*/
/*
in1,in2 : matrices to subtract
n :
- rows : number of rows of in2
+ columns : number of columns of in2
deb_in : place of the first element of in1
ind_boucle : indice of the loop
out : result matrix
*/
-void dlevinsub(double* in1, double* in2, int n, int rows, int deb_in, int ind_boucle, double* out);
-void slevinsub(float* in1, float* in2, int n, int rows, int deb_in, int ind_boucle, float* out);
+void dlevinsub(double* in1, double* in2, int n, int columns, int deb_in, int ind_boucle, double* out);
+void slevinsub(float* in1, float* in2, int n, int columns, int deb_in, int ind_boucle, float* out);
/*initialize a table*/
void dinitTab(double* in, int size);
void sinitTab(float* in, int size);
/*used for the multiplication by z which is equal to step forward*/
-void ddecalage(double* in, int deb_in,int n,int rows,double * out);
-void sdecalage(float* in, int deb_in,int n,int rows,float * out);
+void ddecalage(double* in, int deb_in,int n,int columns,double * out);
+void sdecalage(float* in, int deb_in,int n,int columns,float * out);
/*end*/