summaryrefslogtreecommitdiff
path: root/src/elementaryFunctions/interfaces/int_OpHat.h
diff options
context:
space:
mode:
authortorset2009-02-26 15:36:08 +0000
committertorset2009-02-26 15:36:08 +0000
commitf8241e9e6e96bed42178fe314d9e31e3920e290b (patch)
treefe5294dd0474e1fa0a557a32cd85fd5a8a8474b1 /src/elementaryFunctions/interfaces/int_OpHat.h
parent1ada0172dc98847da9bf6187cad039acb3464bac (diff)
downloadscilab2c-f8241e9e6e96bed42178fe314d9e31e3920e290b.tar.gz
scilab2c-f8241e9e6e96bed42178fe314d9e31e3920e290b.tar.bz2
scilab2c-f8241e9e6e96bed42178fe314d9e31e3920e290b.zip
Add Sci2C test for pow and matrixPow and modify interface, which were wrong
Diffstat (limited to 'src/elementaryFunctions/interfaces/int_OpHat.h')
-rw-r--r--src/elementaryFunctions/interfaces/int_OpHat.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/elementaryFunctions/interfaces/int_OpHat.h b/src/elementaryFunctions/interfaces/int_OpHat.h
index 8858eafc..8cc8849c 100644
--- a/src/elementaryFunctions/interfaces/int_OpHat.h
+++ b/src/elementaryFunctions/interfaces/int_OpHat.h
@@ -61,7 +61,7 @@
}
#define d0z2OpHatz2(in1, in2, size, out) {int i=0;\
- for (i=0,i<size[0]*size[1];i++) out[i]=zpows(DoubleComplex(in1,0),in2[i]);\
+ for (i=0;i<size[0]*size[1];i++) out[i]=zpows(DoubleComplex(in1,0),in2[i]);\
}
#define c0s2OpHatc2(in1, in2, size, out) {int i=0;\
@@ -86,18 +86,22 @@
/* FIXME : malloc here */
#define s2c0OpHatc2(in1,size,in2,out) {float* tmp;\
+ tmp = malloc((uint)(size[0]*size[1])*sizeof(float));\
szerosa(tmp,size[0],size[1]);\
cpowma(FloatComplexMatrix(in1,tmp,size[0]*size[1]),size[0],in2,out);\
+ free(tmp);\
}
-#define d2z0OpHatc2(in1,size,in2,out) {double* tmp;\
+#define d2z0OpHatz2(in1,size,in2,out) {double* tmp;\
+ tmp = malloc((uint)(size[0]*size[1])*sizeof(double));\
dzerosa(tmp,size[0],size[1]);\
zpowma(DoubleComplexMatrix(in1,tmp,size[0]*size[1]),size[0],in2,out);\
+ free(tmp);\
}
#define c2s0OpHatc2(in1,size,in2,out) cpowma(in1,size[0],FloatComplex(in2,0),out);
-#define z2d0OpHatz2(in1,size,in2,out) zpowma(in1,size[0],DoubleCompelx(in2,0),out);
+#define z2d0OpHatz2(in1,size,in2,out) zpowma(in1,size[0],DoubleComplex(in2,0),out);