summaryrefslogtreecommitdiff
path: root/src/c/statisticsFunctions/meanf/ccolumnmeanfa.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/c/statisticsFunctions/meanf/ccolumnmeanfa.c')
-rw-r--r--src/c/statisticsFunctions/meanf/ccolumnmeanfa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/c/statisticsFunctions/meanf/ccolumnmeanfa.c b/src/c/statisticsFunctions/meanf/ccolumnmeanfa.c
index 76eb2eea..6e811262 100644
--- a/src/c/statisticsFunctions/meanf/ccolumnmeanfa.c
+++ b/src/c/statisticsFunctions/meanf/ccolumnmeanfa.c
@@ -14,25 +14,25 @@
#include "sum.h"
#include "multiplication.h"
-void ccolumnmeanfa(floatComplex *in1, int lines, int columns, floatComplex *out,floatComplex *in2) {
+void ccolumnmeanfa(floatComplex *in1, int lines, int columns,floatComplex *in2, floatComplex *out) {
int i = 0;
int j = 0;
- floatComplex tempCoefSum = FloatComplex(0.0f,0.0f);
+ float tempCoefSum = 0.0f;
floatComplex tempMul = FloatComplex(0.0f,0.0f);
/*we first multiply each cell of the input matrix by its coefficient*/
for (j = 0; j < lines ; ++j)
{
- tempCoefSum = FloatComplex(0.0f,0.0f);
+ tempCoefSum = 0.0f;
out[j]= FloatComplex(0.0f,0.0f);
for ( i = 0 ; i < columns; ++i )
{
- tempMul = cmuls ( in1[lines*i + j] , in2[lines*i + j]); // we times by the coefficient
- tempCoefSum = cadds ( in2[lines*i + j] ,tempCoefSum ) ;
+ tempMul = cmuls ( in1[lines*i + j] , in2[lines*i + j]); /* we times by the coefficient*/
+ tempCoefSum += creals(in2[lines*i + j]) ;
out[j] = cadds (tempMul, out[j]) ;
}
- out[j] = crdivs(out[j] ,tempCoefSum) ;
+ out[j] =FloatComplex(creals(out[j]) /tempCoefSum, cimags(out[j]) /tempCoefSum);
}
}