compute final mean instead of count and denominator, ref #5

soprasteria · Apr 11, 2017 · 3b8b5e0 · 3b8b5e0
1 parent e7b0f1c
commit 3b8b5e0
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/miw/log_record.cc b/miw/log_record.cc
@@ -580,13 +580,18 @@ namespace miw
 		jrec[json_fnamec] = jsfc;
 	      }
 	    else if (f.aggregation() == "sum"
-		     || f.aggregation() == "count"
-		     || f.aggregation() == "mean")
+		     || f.aggregation() == "count")
 	      {
 		jrec[json_fname] = jsf;
 		if (!jsfh.isNull())
 		  jrec[json_fnameh] = jsfh;
 	      }
+	    else if (f.aggregation() == "mean")
+	      {
+		if (!jsfh.isNull())
+		  jrec[json_fname] = jsf.asDouble() / jsfh.asDouble();
+		else jrec[json_fname] = jsf;
+	      }
 	  }
 	else jrec[json_fname] = jsf;
       }