Fix average functions (fix for #5386)

Benjamin Renard
1 parent 397d8b8d
Showing 1 changed file with 23 additions and 9 deletions Show diff stats
src/Parameters/DataTypeMath.hh
@@ -363,27 +363,34 @@
 	 */
 	template <typename Type>
 	inline Type average(std::list<Type> tab) {
-
 		Type mean;
 		if(tab.empty()) {
-			mean << notANumber;
+			mean << NotANumber();
 		}
 		else {
-			mean << elemNull;
+			mean << ElemNull();
 			auto it = tab.begin();
 			if (it != tab.end()) {
 				unsigned int nbNan = 0;
 				Type sum = *it;
 				++it;
 				for (; it != tab.end(); ++it) {
-					if(isFinite(*it)) {
+					if(isFinite(*it) && !isNAN(*it)) {
 						sum = sum + *it;
 					}
 					else {
 						++nbNan;
 					}
 				}
-				mean = sum / (int)(tab.size() - nbNan);
+				if (tab.size() - nbNan == 0) {
+					mean << NotANumber();
+				}
+				else {
+					mean = sum / (int)(tab.size() - nbNan);
+				}
+			}
+			else {
+				mean << NotANumber();
 			}
 		}
 		return mean;
@@ -394,12 +401,12 @@
 	 */
 	template <typename Type>
 	inline std::vector<Type> average(std::list<std::vector<Type> > tab) {
-
 		std::vector<Type> mean;
 		std::vector<unsigned int >nbNan;
 		std::vector<Type> sum ;
 		if(tab.empty()) {
-			BOOST_THROW_EXCEPTION(AMDA::AMDA_exception() << AMDA::errno_code(AMDA_OPER_NOT_ALLOWED) << AMDA::ex_msg("Average on empty table"));
+			mean << NotANumber();
+			return mean;
 		}
 		for(unsigned int index = 0; index < tab.begin()->size(); ++index) {
 			nbNan.push_back(0);
@@ -408,7 +415,7 @@
 		for (auto it = tab.begin(); it != tab.end(); ++it) {
 			for(unsigned int index = 0; index < it->size(); ++index) {
 				Type val = it->at(index);
-				if(std::isfinite(val)) {
+				if(std::isfinite(val) && !isNAN(val)) {
 					sum[index] +=val;
 				}
 				else {
@@ -416,8 +423,15 @@
 				}
 			}
 		}
+		Type compNan;
+		compNan << NotANumber();
 		for(unsigned int index = 0; index < tab.begin()->size(); ++index) {
-			mean.push_back( sum[index] / (int)(tab.size() - nbNan[index])); // 0/0 => NaN
+			if (tab.size() - nbNan[index] == 0) {
+				mean.push_back(compNan);
+			}
+			else {
+				mean.push_back( sum[index] / (int)(tab.size() - nbNan[index])); // 0/0 => NaN
+			}
 		}