summaryrefslogtreecommitdiff
path: root/src/matrixOperations/multiplication
diff options
context:
space:
mode:
authortorset2009-01-20 10:53:46 +0000
committertorset2009-01-20 10:53:46 +0000
commite329ccf8391f7ce500f66d495da964fb518a7067 (patch)
tree712a420c3e6b3c0f09f8432aeb7d62cc668eeba9 /src/matrixOperations/multiplication
parentb229bf5b69c14b0fae11389433cc2bff3a683832 (diff)
downloadscilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.tar.gz
scilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.tar.bz2
scilab2c-e329ccf8391f7ce500f66d495da964fb518a7067.zip
rm addm and diffm cause they are equal to add and diff, up expm cause it used addm and diffm and now is using add and diff
Diffstat (limited to 'src/matrixOperations/multiplication')
-rw-r--r--src/matrixOperations/multiplication/cmulma.c2
-rw-r--r--src/matrixOperations/multiplication/zmulma.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/matrixOperations/multiplication/cmulma.c b/src/matrixOperations/multiplication/cmulma.c
index 58742d99..33eab648 100644
--- a/src/matrixOperations/multiplication/cmulma.c
+++ b/src/matrixOperations/multiplication/cmulma.c
@@ -36,7 +36,7 @@ void cmulma(floatComplex *in1, int lines1, int columns1,
for (k = 0; k < columns1 ; ++k)
{
accu = cadds(accu,
- ctimess(in1[i % lines1 + k *lines1] ,
+ cmuls(in1[i % lines1 + k *lines1] ,
in2[k + (i / lines1) *lines2] ));
}
out[i] = accu;
diff --git a/src/matrixOperations/multiplication/zmulma.c b/src/matrixOperations/multiplication/zmulma.c
index d1552ca6..73df3d52 100644
--- a/src/matrixOperations/multiplication/zmulma.c
+++ b/src/matrixOperations/multiplication/zmulma.c
@@ -94,7 +94,7 @@ void zmulma(doubleComplex *in1, int lines1, int columns1,
for (k = 0; k < columns1 ; ++k)
{
accu = zadds(accu,
- ztimess(in1[i % lines1 + k *lines1] ,
+ zmuls(in1[i % lines1 + k *lines1] ,
in2[k + (i / lines1) *lines2] ));
}
out[i] = accu;