summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsimon2009-07-16 12:35:30 +0000
committersimon2009-07-16 12:35:30 +0000
commit404fe6d0c2f7ddc158d8d14a0974ed94287ff9da (patch)
treeab86bb2f79e172aec8d3fc727c332955e1f7af58 /src
parent0019d6a1d68d0500e0b58a673e187162c222263a (diff)
downloadscilab2c-404fe6d0c2f7ddc158d8d14a0974ed94287ff9da.tar.gz
scilab2c-404fe6d0c2f7ddc158d8d14a0974ed94287ff9da.tar.bz2
scilab2c-404fe6d0c2f7ddc158d8d14a0974ed94287ff9da.zip
added test for find and corrected the interface
updated INIT_FillSCI2LibCDirs
Diffstat (limited to 'src')
-rw-r--r--src/c/auxiliaryFunctions/interfaces/int_find.h65
1 files changed, 50 insertions, 15 deletions
diff --git a/src/c/auxiliaryFunctions/interfaces/int_find.h b/src/c/auxiliaryFunctions/interfaces/int_find.h
index 7d620e6c..c57f0148 100644
--- a/src/c/auxiliaryFunctions/interfaces/int_find.h
+++ b/src/c/auxiliaryFunctions/interfaces/int_find.h
@@ -62,14 +62,29 @@
#define z0d0findd0(in1,in2) z0findd0(in1)
-#define s2s0finds2(in1,size,in2,out) s2finds2(in1,size,out_tmp);for(int i=0;i<in2;i++) out[i]=out_tmp[i];
-
-#define d2d0findd2(in1,size,in2,out) d2findd2(in1,size,out_tmp);for(int i=0;i<in2;i++) out[i]=out_tmp[i];
-
-#define c2s0finds2(in1,size,in2,out) c2finds2(in1,size,out_tmp);for(int i=0;i<in2;i++) out[i]=out_tmp[i];
-
-#define z2d0findd2(in1,size,in2,out) z2findd2(in1,size,out_tmp);for(int i=0;i<in2;i++) out[i]=out_tmp[i];
-
+#define s2s0finds2(in1,size,in2,out,sizeOut) {\
+ float* out_tmp = out;\
+ int i = 0 ;\
+ s2finds2(in1,size,out_tmp,sizeOut);for( i=0;i<in2;i++){out[i]=out_tmp[i];}\
+ }
+
+#define d2d0findd2(in1,size,in2,out,sizeOut) {\
+ double* out_tmp = out;\
+ int i = 0 ;\
+ d2findd2(in1,size,out_tmp,sizeOut);for( i=0;i<in2;i++){out[i]=out_tmp[i];}\
+ }
+
+#define c2s0finds2(in1,size,in2,out,sizeOut) {\
+ floatComplex* out_tmp = out;\
+ int i = 0 ;\
+ c2finds2(in1,size,out_tmp,sizeOut);for( i=0;i<in2;i++){out[i]=out_tmp[i];}\
+ }
+
+#define z2d0findd2(in1,size,in2,out,sizeOut) {\
+ doubleComplex* out_tmp = out;\
+ int i = 0 ;\
+ z2findd2(in1,size,out_tmp,sizeOut);for( i=0;i<in2;i++){out[i]=out_tmp[i];}\
+ }
/* 2 inputs, 2 outputs */
#define s0s0finds0s0(in1,in2,out2) s0finds0s0(in1,out2)
@@ -82,13 +97,33 @@
/*FIXME : prototypes are wrong*/
-#define s2s0finds2s2(in1,size,in2,out1,out2) s2finds2s2(in1,size,out1_tmp,out_tmp2);for(int i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}
-
-#define d2d0findd2d2(in1,size,in2,out1,out2) d2findd2d2(in1,size,out1_tmp,out_tmp2);for(int i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}
-
-#define c2s0finds2s2(in1,size,in2,out1,out2) c2finds2s2(in1,size,out1_tmp,out_tmp2);for(int i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}
-
-#define z2d0findd2d2(in1,size,in2,out1,out2) z2findd2d2(in1,size,out1_tmp,out_tmp2);for(int i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}
+#define s2s0finds2s2(in1,size,in2,out1,sizeOut1,out2,sizeOut2) {\
+ float* out1_tmp = out1;\
+ float* out2_tmp = out2;\
+ int i = 0 ;\
+ s2finds2s2(in1,size,out1_tmp,sizeOut1,out2_tmp,sizeOut2);for( i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}\
+ }
+
+#define d2d0findd2d2(in1,size,in2,out1,sizeOut1,out2,sizeOut2) {\
+ double* out1_tmp = out1;\
+ double* out2_tmp = out2;\
+ int i = 0 ;\
+ d2findd2d2(in1,size,out1_tmp,sizeOut1,out2_tmp,sizeOut2);for( i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}\
+ }
+
+#define c2s0finds2s2(in1,size,in2,out1,sizeOut1,out2,sizeOut2) {\
+ floatComplex* out1_tmp = out1;\
+ floatComplex* out2_tmp = out2;\
+ int i = 0 ;\
+ c2finds2s2(in1,size,out1_tmp,sizeOut1,out_tmp2,sizeOut2);for( i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}\
+ }
+
+#define z2d0findd2d2(in1,size,in2,out1,sizeOut1,out2,sizeOut2) {\
+ doubleComplex* out1_tmp = out1;\
+ doubleComplex* out2_tmp = out2;\
+ int i = 0 ;\
+ z2findd2d2(in1,size,out1_tmp,sizeOut1,out2_tmp,sizeOut2);for( i=0;i<in2;i++) {out1[i]=out1_tmp[i];out2[i]= out2_tmp[i];}\
+ }