summaryrefslogtreecommitdiff
path: root/src/type
diff options
context:
space:
mode:
authortorset2008-11-13 08:53:04 +0000
committertorset2008-11-13 08:53:04 +0000
commitfbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13 (patch)
treec8b12bbb58726a21a6339cce4ba9e909cd285816 /src/type
parente4bf45d022a05af69e506fec2c9bde6ec105905a (diff)
downloadscilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.tar.gz
scilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.tar.bz2
scilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.zip
change repertory for the multiplication and division and made the modifs in the files using them.
Diffstat (limited to 'src/type')
-rw-r--r--src/type/doubleComplex.c34
-rw-r--r--src/type/doubleComplex.h2
-rw-r--r--src/type/floatComplex.c35
-rw-r--r--src/type/floatComplex.h3
4 files changed, 0 insertions, 74 deletions
diff --git a/src/type/doubleComplex.c b/src/type/doubleComplex.c
index 6ef9deeb..710a13f9 100644
--- a/src/type/doubleComplex.c
+++ b/src/type/doubleComplex.c
@@ -133,38 +133,4 @@ bool zisimags(doubleComplex z) {
return false;
}
-/*
-** Operators
-** {
-*/
-
-/*
-** \function ztimess
-** \brief Multiply 2 Complex numbers.
-*/
-doubleComplex ztimess(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
-}
-/*
-** \function zdivides
-** \brief Divide 2 Complex numbers.
-*/
-doubleComplex zdevides(doubleComplex z1, doubleComplex z2) {
-#ifndef STDC99
- return DoubleComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
- (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
-#else
- return z1 / z2;
-#endif
-}
-
-
-/*
-** }
-*/
diff --git a/src/type/doubleComplex.h b/src/type/doubleComplex.h
index ce491b90..51cede5d 100644
--- a/src/type/doubleComplex.h
+++ b/src/type/doubleComplex.h
@@ -64,6 +64,4 @@ doubleComplex* DoubleComplexMatrix(double*, double*, int);
bool zisreals(doubleComplex);
bool zisimags(doubleComplex);
-doubleComplex ztimess(doubleComplex, doubleComplex);
-doubleComplex zdevides(doubleComplex, doubleComplex);
#endif /* !__DOUBLECOMPLEX_H__ */
diff --git a/src/type/floatComplex.c b/src/type/floatComplex.c
index 09ae0159..d160e2d3 100644
--- a/src/type/floatComplex.c
+++ b/src/type/floatComplex.c
@@ -135,39 +135,4 @@ bool cisimags(floatComplex z) {
return false;
}
-/*
-** Operators
-** {
-*/
-
-/*
-** \function ctimess
-** \brief Multiply 2 Complex numbers.
-*/
-floatComplex ctimess(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
-}
-
-/*
-** \function cdivides
-** \brief Divide 2 Complex numbers.
-*/
-floatComplex cdevides(floatComplex z1, floatComplex z2) {
-#ifndef STDC99
- return FloatComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
- (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
-#else
- return z1 / z2;
-#endif
-}
-
-
-/*
-** }
-*/
diff --git a/src/type/floatComplex.h b/src/type/floatComplex.h
index 47a77899..a4e4f658 100644
--- a/src/type/floatComplex.h
+++ b/src/type/floatComplex.h
@@ -64,7 +64,4 @@ floatComplex* FloatComplexMatrix(float*, float*, int);
bool cisreals(floatComplex);
bool cisimags(floatComplex);
-floatComplex ctimess(floatComplex, floatComplex);
-floatComplex cdevides(floatComplex, floatComplex);
-
#endif /* !__FLOATCOMPLEX_H__ */