summaryrefslogtreecommitdiff
path: root/src/operations
diff options
context:
space:
mode:
authortorset2009-01-20 13:18:25 +0000
committertorset2009-01-20 13:18:25 +0000
commit9906f47e2efe7c113436520c90021eef39751b7e (patch)
tree77643b8ed3ac062c8a60f78a1d69a27f6fd107cc /src/operations
parent6c809943b1d0e82c85aa5a76b0e21a664831ab27 (diff)
downloadscilab2c-9906f47e2efe7c113436520c90021eef39751b7e.tar.gz
scilab2c-9906f47e2efe7c113436520c90021eef39751b7e.tar.bz2
scilab2c-9906f47e2efe7c113436520c90021eef39751b7e.zip
it seems all modifications are ok
Diffstat (limited to 'src/operations')
-rw-r--r--src/operations/division/cldivs.c2
-rw-r--r--src/operations/division/zldivs.c2
-rw-r--r--src/operations/multiplication/cmuls.c27
-rw-r--r--src/operations/multiplication/zmuls.c26
4 files changed, 51 insertions, 6 deletions
diff --git a/src/operations/division/cldivs.c b/src/operations/division/cldivs.c
index c58e33b4..8ada5da4 100644
--- a/src/operations/division/cldivs.c
+++ b/src/operations/division/cldivs.c
@@ -21,7 +21,7 @@
floatComplex cldivs (floatComplex in1, floatComplex in2){
floatComplex fC1, fC2;
- fC1 = ctimess(in2,cconjs(in1));
+ fC1 = cmuls(in2,cconjs(in1));
fC2 = FloatComplex(creals(in1)*creals(in1)+cimags(in1)*cimags(in1),0);
return crdivs(fC1,fC2);
}
diff --git a/src/operations/division/zldivs.c b/src/operations/division/zldivs.c
index ec8a6a8c..be28a568 100644
--- a/src/operations/division/zldivs.c
+++ b/src/operations/division/zldivs.c
@@ -21,7 +21,7 @@
doubleComplex zldivs (doubleComplex in1, doubleComplex in2){
doubleComplex zC1, zC2;
- zC1 = ztimess(in2,zconjs(in1));
+ zC1 = zmuls(in2,zconjs(in1));
zC2 = DoubleComplex(zreals(in1)*zreals(in1)+zimags(in1)*zimags(in1),0);
return zrdivs(zC1,zC2);
}
diff --git a/src/operations/multiplication/cmuls.c b/src/operations/multiplication/cmuls.c
index a205427f..817f3771 100644
--- a/src/operations/multiplication/cmuls.c
+++ b/src/operations/multiplication/cmuls.c
@@ -11,8 +11,31 @@
*/
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+
+#include "floatComplex.h"
#include "multiplication.h"
-floatComplex cmuls(floatComplex in1, floatComplex in2){
- return ctimess(in1,in2);
+
+
+/*
+** \function cmuls
+** \brief Multiply 2 Complex numbers.
+*/
+floatComplex cmuls(floatComplex z1, floatComplex z2) {
+#ifndef STDC99
+ return FloatComplex(z1.real*z2.real - z1.imag*z2.imag,
+ z1.real*z2.imag + z2.real*z1.imag);
+#else
+ return z1 * z2;
+#endif
}
diff --git a/src/operations/multiplication/zmuls.c b/src/operations/multiplication/zmuls.c
index fbd14f8d..eacbc135 100644
--- a/src/operations/multiplication/zmuls.c
+++ b/src/operations/multiplication/zmuls.c
@@ -11,8 +11,30 @@
*/
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+
+#include "doubleComplex.h"
#include "multiplication.h"
-doubleComplex zmuls(doubleComplex in1, doubleComplex in2){
- return ztimess(in1,in2);
+
+/*
+** \function zmuls
+** \brief Multiply 2 Complex numbers.
+*/
+doubleComplex zmuls(doubleComplex z1, doubleComplex z2) {
+#ifndef STDC99
+ return DoubleComplex(z1.real*z2.real - z1.imag*z2.imag,
+ z1.real*z2.imag + z2.real*z1.imag);
+#else
+ return z1 * z2;
+#endif
}