diff options
author | simon | 2009-08-04 11:52:49 +0000 |
---|---|---|
committer | simon | 2009-08-04 11:52:49 +0000 |
commit | be8c66b26fa69a8078ee369f0af5fb9372f95293 (patch) | |
tree | d3574f2f85042a199d5455221f58b23f05d5e394 /src/c/statisticsFunctions/meanf/zmeanfa.c | |
parent | ac2f79dabb674e9cf79e611c19b3acd2d98a9831 (diff) | |
download | scilab2c-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/zmeanfa.c')
-rw-r--r-- | src/c/statisticsFunctions/meanf/zmeanfa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/c/statisticsFunctions/meanf/zmeanfa.c b/src/c/statisticsFunctions/meanf/zmeanfa.c index 592111d5..f6691d91 100644 --- a/src/c/statisticsFunctions/meanf/zmeanfa.c +++ b/src/c/statisticsFunctions/meanf/zmeanfa.c @@ -12,17 +12,18 @@ #include "meanf.h" #include "multiplication.h" +#include "division.h" doubleComplex zmeanfa(doubleComplex *in1, int size, doubleComplex *in2 ) { doubleComplex accumulate = DoubleComplex(0.0, 0.0); - double freAccumulate = 0.0; + doubleComplex freAccumulate = DoubleComplex(0.0, 0.0); int i = 0; for (i = 0; i < size; ++i) { accumulate = zadds(accumulate , zmuls( in1[i] ,in2[i])); - freAccumulate += zreals(in2[i]); + freAccumulate = zadds(in2[i],freAccumulate); } - return DoubleComplex(zreals(accumulate) / freAccumulate, zimags(accumulate) /freAccumulate); + return zrdivs(accumulate ,freAccumulate); } |