summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/operations/includes/multiplication.h28
-rw-r--r--src/operations/multiplication/cmula.c5
-rw-r--r--src/operations/multiplication/dmula.c5
-rw-r--r--src/operations/multiplication/smula.c6
-rw-r--r--src/operations/multiplication/testMultiplication.c8
-rw-r--r--src/operations/multiplication/zmula.c5
6 files changed, 21 insertions, 36 deletions
diff --git a/src/operations/includes/multiplication.h b/src/operations/includes/multiplication.h
index 4e55c125..04e5c1d7 100644
--- a/src/operations/includes/multiplication.h
+++ b/src/operations/includes/multiplication.h
@@ -34,14 +34,11 @@ float smuls(float in1, float in2);
/*
** \brief Compute a multiplication element ways for floats.
** \param in1 : input array.
-** \param size1 : size of in1 array.
** \param in2 : input arry.
-** \param size2 : size of in2 array.
+** \param size : size of in2 array.
** \param out : array that contains the multiplication = in1 .* in2.
*/
-void smula(float *in1, int size1,
- float *in2, int size2,
- float *out);
+void smula(float *in1, float *in2, int size2, float *out);
/*
** \brief Compute a multiplication with double.
@@ -54,14 +51,11 @@ double dmuls(double in1, double in2);
/*
** \brief Compute a multiplication element ways for double.
** \param in1 : input array.
-** \param size1 : size of in1 array.
** \param in2 : input arry.
-** \param size2 : size of in2 array.
+** \param size : size of in2 array.
** \param out : array that contains the multiplication = in1 .* in2.
*/
-void dmula(double *in1, int size1,
- double *in2, int size2,
- double * out);
+void dmula(double *in1, double *in2, int size,double * out);
/*
** \brief Compute a multiplication with floats Complex.
@@ -74,14 +68,11 @@ floatComplex cmuls(floatComplex in1, floatComplex in2);
/*
** \brief Compute a multiplication element ways for complex single precision.
** \param in1 : input array.
-** \param size1 : size of in1 array.
** \param in2 : input arry.
-** \param size2 : size of in2 array.
+** \param size : size of in2 array.
** \param out : array that contains the multiplication = in1 .* in2.
*/
-void cmula(floatComplex *in1, int size1,
- floatComplex *in2, int size2,
- floatComplex *out);
+void cmula(floatComplex *in1, floatComplex *in2, int size, floatComplex *out);
/*
** \brief Compute a multiplication with double complex.
@@ -94,14 +85,11 @@ doubleComplex zmuls(doubleComplex in1, doubleComplex in2);
/*
** \brief Compute a multiplication element ways for complex double precision.
** \param in1 : input array.
-** \param size1 : size of in1 array.
** \param in2 : input arry.
-** \param size2 : size of in2 array.
+** \param size: size of in2 array.
** \param out : array that contains the multiplication = in1 .* in2.
*/
-void zmula(doubleComplex *in1, int size1,
- doubleComplex *in2, int size2,
- doubleComplex *out);
+void zmula(doubleComplex *in1, doubleComplex *in2, int size, doubleComplex *out);
/*
diff --git a/src/operations/multiplication/cmula.c b/src/operations/multiplication/cmula.c
index 6f7f4a34..2bb94002 100644
--- a/src/operations/multiplication/cmula.c
+++ b/src/operations/multiplication/cmula.c
@@ -13,10 +13,9 @@
#include "multiplication.h"
-void cmula(floatComplex* in1, int size1, floatComplex* in2, int size2, floatComplex* out){
+void cmula(floatComplex* in1, floatComplex* in2, int size, floatComplex* out){
int i=0;
- for (i=0;i<size1;i++){
+ for (i=0;i<size;i++){
out[i]=cmuls(in1[i],in2[i]);
}
- for (i=0;i<size2;i++){}
}
diff --git a/src/operations/multiplication/dmula.c b/src/operations/multiplication/dmula.c
index 9560ec68..976faacf 100644
--- a/src/operations/multiplication/dmula.c
+++ b/src/operations/multiplication/dmula.c
@@ -13,10 +13,9 @@
#include "multiplication.h"
-void dmula(double* in1, int size1, double* in2, int size2, double* out){
+void dmula(double* in1, double* in2, int size, double* out){
int i=0;
- for (i=0;i<size1;i++){
+ for (i=0;i<size;i++){
out[i]=dmuls(in1[i],in2[i]);
}
- for (i=0;i<size2;i++){}
}
diff --git a/src/operations/multiplication/smula.c b/src/operations/multiplication/smula.c
index e4e366b2..83266919 100644
--- a/src/operations/multiplication/smula.c
+++ b/src/operations/multiplication/smula.c
@@ -13,10 +13,10 @@
#include "multiplication.h"
-void smula(float* in1, int size1, float* in2, int size2, float* out){
+void smula(float* in1, float* in2, int size, float* out){
int i=0;
- for (i=0;i<size1;i++){
+ for (i=0;i<size;i++){
out[i]=smuls(in1[i],in2[i]);
}
- for (i=0;i<size2;i++){}
+
}
diff --git a/src/operations/multiplication/testMultiplication.c b/src/operations/multiplication/testMultiplication.c
index 106e91e8..87cf465c 100644
--- a/src/operations/multiplication/testMultiplication.c
+++ b/src/operations/multiplication/testMultiplication.c
@@ -1358,7 +1358,7 @@ static void smulaTest(void){
int i=0;
float out[200];
- smula(P1,200,P2,200,out);
+ smula(P1,P2,200,out);
for(i=0;i<200;i++){
assert( ( fabs(out[i]-Res[i]) / fabs(out[i]) ) <1e-6);
}
@@ -1372,7 +1372,7 @@ static void dmulaTest(void){
int i=0;
double out[200];
- dmula(P1,200,P2,200,out);
+ dmula(P1,P2,200,out);
for(i=0;i<200;i++){
assert( ( fabs(out[i]-Res[i]) / fabs(out[i]) ) <1e-16);
}
@@ -1394,7 +1394,7 @@ static void cmulaTest(void){
in2[i]=FloatComplex(P2_R[i],P2_I[i]);
}
- cmula(in1,200,in2,200,out);
+ cmula(in1,in2,200,out);
for (i=0;i<200;i++){
assert( ( fabs(creals(out[i])-Res_R[i]) / fabs(creals(out[i])) ) <1e-5);
assert( ( fabs(cimags(out[i])-Res_I[i]) / fabs(cimags(out[i])) ) <1e-6);
@@ -1417,7 +1417,7 @@ static void zmulaTest(void){
in2[i]=DoubleComplex(P2_R[i],P2_I[i]);
}
- zmula(in1,200,in2,200,out);
+ zmula(in1,in2,200,out);
for (i=0;i<200;i++){
assert( ( fabs(zreals(out[i])-Res_R[i]) / fabs(zreals(out[i])) ) <1e-14);
assert( ( fabs(zimags(out[i])-Res_I[i]) / fabs(zimags(out[i])) ) <1e-15);
diff --git a/src/operations/multiplication/zmula.c b/src/operations/multiplication/zmula.c
index ff3c736f..875e2592 100644
--- a/src/operations/multiplication/zmula.c
+++ b/src/operations/multiplication/zmula.c
@@ -13,10 +13,9 @@
#include "multiplication.h"
-void zmula(doubleComplex* in1, int size1, doubleComplex* in2, int size2, doubleComplex* out){
+void zmula(doubleComplex* in1, doubleComplex* in2, int size, doubleComplex* out){
int i=0;
- for (i=0;i<size1;i++){
+ for (i=0;i<size;i++){
out[i]=zmuls(in1[i],in2[i]);
}
- for (i=0;i<size2;i++){}
}