From 7347e8f3e2715fcea8b2bcacdecd4ad32a2c691f Mon Sep 17 00:00:00 2001 From: torset Date: Thu, 15 Jan 2009 09:03:16 +0000 Subject: add interfaces --- .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 8 +- src/auxiliaryFunctions/interfaces/int_find.h | 80 +++++++++++-- src/auxiliaryFunctions/interfaces/int_rand.h | 67 ----------- src/auxiliaryFunctions/interfaces/int_size.h | 71 ++++++++++++ src/matrixOperations/Makefile.am | 3 +- src/matrixOperations/Makefile.in | 3 +- src/matrixOperations/includes/determ.h | 8 +- src/matrixOperations/includes/ones.h | 22 ++++ src/matrixOperations/interfaces/int_BackSlash.h | 37 ++++++ src/matrixOperations/interfaces/int_OpSlash.h | 20 ++-- src/matrixOperations/interfaces/int_OpStar.h | 18 +-- src/matrixOperations/interfaces/int_cat.h | 124 +++++++++++++++++++++ src/matrixOperations/interfaces/int_det.h | 34 ++++++ src/matrixOperations/interfaces/int_invert.h | 34 ++++++ src/matrixOperations/interfaces/int_trace.h | 34 ++++++ src/matrixOperations/interfaces/interface.sh | 6 + src/operations/includes/division.h | 72 ++++-------- src/operations/includes/multiplication.h | 8 +- src/operations/interface/int_DotBackSlash.h | 16 +-- src/operations/interface/int_OpDotSlash.h | 16 +-- src/operations/interface/int_OpDotStar.h | 16 +-- src/operations/interface/int_OpMinus.h | 16 +++ src/operations/interface/int_OpPlus.h | 22 ++++ src/signalProcessing/includes/fft.h | 9 ++ src/signalProcessing/includes/ifft.h | 7 ++ src/signalProcessing/interfaces/int_cepstrum.h | 34 ++++++ src/signalProcessing/interfaces/int_convol.h | 35 ++++++ src/signalProcessing/interfaces/int_fft.h | 52 +++++++++ src/signalProcessing/interfaces/int_ifft.h | 34 ++++++ src/signalProcessing/interfaces/int_lev.h | 34 ++++++ 30 files changed, 760 insertions(+), 180 deletions(-) delete mode 100644 src/auxiliaryFunctions/interfaces/int_rand.h create mode 100644 src/auxiliaryFunctions/interfaces/int_size.h create mode 100644 src/matrixOperations/interfaces/int_BackSlash.h create mode 100644 src/matrixOperations/interfaces/int_cat.h create mode 100644 src/matrixOperations/interfaces/int_det.h create mode 100644 src/matrixOperations/interfaces/int_invert.h create mode 100644 src/matrixOperations/interfaces/int_trace.h create mode 100755 src/matrixOperations/interfaces/interface.sh create mode 100644 src/signalProcessing/interfaces/int_cepstrum.h create mode 100644 src/signalProcessing/interfaces/int_convol.h create mode 100644 src/signalProcessing/interfaces/int_fft.h create mode 100644 src/signalProcessing/interfaces/int_ifft.h create mode 100644 src/signalProcessing/interfaces/int_lev.h (limited to 'src') diff --git a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 7a4974dd..2af8c1ff 100644 --- a/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/src/Scilab2C/Scilab2C/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -498,10 +498,10 @@ PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('c0c0'+ArgSeparator+'c0',ClassFileName,'file','y'); PrintStringInfo('z0d0'+ArgSeparator+'z0',ClassFileName,'file','y'); -PrintStringInfo('s2s0'+ArgSeparator+'s0',ClassFileName,'file','y'); -PrintStringInfo('d2d0'+ArgSeparator+'d0',ClassFileName,'file','y'); -PrintStringInfo('c2s0'+ArgSeparator+'c0',ClassFileName,'file','y'); -PrintStringInfo('z2d0'+ArgSeparator+'z0',ClassFileName,'file','y'); +PrintStringInfo('s2s0'+ArgSeparator+'s0',ClassFileName,'file','y');/* possible ? */ +PrintStringInfo('d2d0'+ArgSeparator+'d0',ClassFileName,'file','y');/* possible ? */ +PrintStringInfo('c2s0'+ArgSeparator+'c0',ClassFileName,'file','y');/* possible ? */ +PrintStringInfo('z2d0'+ArgSeparator+'z0',ClassFileName,'file','y');/* possible ? */ PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y'); diff --git a/src/auxiliaryFunctions/interfaces/int_find.h b/src/auxiliaryFunctions/interfaces/int_find.h index 742ddc06..2df50986 100644 --- a/src/auxiliaryFunctions/interfaces/int_find.h +++ b/src/auxiliaryFunctions/interfaces/int_find.h @@ -15,20 +15,84 @@ #ifndef __INT_FIND_H__ #define __INT_FIND_H__ -#define s0finds0(in) (in == 0) ? -1 : in +/* 1 input, 1 output */ -#define d0findd0(in) (in == 0) ? -1 : in +#define s0finds0(in) (in == 0) ? -1 : in + +#define d0findd0(in) (in == 0) ? -1 : in -#define c0findc0(in) ((creals(in) == 0) && (cimags(in) == 0)) ? -1 : in +#define c0finds0(in) ((creals(in) == 0) && (cimags(in) == 0)) ? -1 : in -#define z0findz0(in) ((zreals(in) == 0) && (zimags(in) == 0)) ? -1 : in +#define z0findd0(in) ((zreals(in) == 0) && (zimags(in) == 0)) ? -1 : in -#define s2finds2(in,size,out) sfinda(in, size[0]*size[1]) +#define s2finds2(in,size,out) sfinda(in, size[0]*size[1]) -#define d2findd2(in,size,out) dfinda(in, size[0]*size[1]) +#define d2findd2(in,size,out) dfinda(in, size[0]*size[1]) + +#define c2finds2(in,size,out) cfinda(in, size[0]*size[1]) + +#define z2findd2(in,size,out) zfinda(in, size[0]*size[1]) + +/* 1 input, 2 outputs */ + +#define s0finds0s0(in,out1,out2) if (in==0) {out1=0;out2=0;} + +#define d0findd0d0(in,out1,out2) if (in==0) {out1=0;out2=0;} + +#define c0finds0s0(in,out1,out2) if ((creals(in)==0) && (cimags(in)==0)) {out1=0;out2=0;} + +#define z0findd0d0(in,out1,out2) if ((zreals(in)==0) && (zimags(in)==0)) {out1=0;out2=0;} + +#define s2finds2s2(in,size,out1,out2) sfind2d(in,size[0],size[1],&out1,&out2) + +#define d2findd2d2(in,size,out1,out2) dfind2d(in,size[0],size[1],&out1,&out2) + +#define c2finds2s2(in,size,out1,out2) cfind2d(in,size[0],size[1],&out1,&out2) + +#define z2finds2s2(in,size,out1,out2) zfind2d(in,size[0],size[1],&out1,&out2) + +/* 2 inputs, 1 output */ + +#define s0s0finds0(in1,in2) s0finds0(in1) + +#define d0d0findd0(in1,in2) d0findd0(in1) + +#define c0s0finds0(in1,in2) c0finds0(in1) + +#define z0d0findd0(in1,in2) z0findd0(in1) + +#define s2s0finds2(in1,size,in2,out) s2finds2(in1,size,out_tmp);for(int i=0;i