summaryrefslogtreecommitdiff
path: root/src/c/statisticsFunctions/meanf/cmeanfa.c
diff options
context:
space:
mode:
authorsimon2009-08-04 11:52:49 +0000
committersimon2009-08-04 11:52:49 +0000
commitbe8c66b26fa69a8078ee369f0af5fb9372f95293 (patch)
treed3574f2f85042a199d5455221f58b23f05d5e394 /src/c/statisticsFunctions/meanf/cmeanfa.c
parentac2f79dabb674e9cf79e611c19b3acd2d98a9831 (diff)
downloadscilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.tar.gz
scilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.tar.bz2
scilab2c-be8c66b26fa69a8078ee369f0af5fb9372f95293.zip
added case where second input of meanf is complex
updated the header and interface added functiosn for the new cases update INIT_FillSCI2LibCDirs changing the unit test in order to test the new cases
Diffstat (limited to 'src/c/statisticsFunctions/meanf/cmeanfa.c')
-rw-r--r--src/c/statisticsFunctions/meanf/cmeanfa.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/c/statisticsFunctions/meanf/cmeanfa.c b/src/c/statisticsFunctions/meanf/cmeanfa.c
index fceaff7d..1aeef53d 100644
--- a/src/c/statisticsFunctions/meanf/cmeanfa.c
+++ b/src/c/statisticsFunctions/meanf/cmeanfa.c
@@ -12,29 +12,19 @@
#include "meanf.h"
#include "multiplication.h"
-
+#include "division.h"
floatComplex cmeanfa(floatComplex *in1, int size, floatComplex *in2 ) {
floatComplex accumulate = FloatComplex(0.0f, 0.0f);
- float freAccumulate = 0.0f;
+ floatComplex freAccumulate = FloatComplex(0.0f, 0.0f);
int i = 0;
for (i = 0; i < size; ++i)
{
accumulate = cadds(accumulate, cmuls (in1[i] , in2[i]));
- freAccumulate += creals(in2[i]);
+ freAccumulate = cadds(in2[i],freAccumulate);
}
- return FloatComplex(creals(accumulate) /freAccumulate, cimags(accumulate) /freAccumulate);
+ return crdivs(accumulate ,freAccumulate) ;
}
-/*
- for (i = 0; i < size; ++i)
- {
- accumulate += (in1[i] * in2[i]) ;
- freAccumulate += in2[i] ;
- }
- return accumulate / freAccumulate;
-
-
-*/