Changeset 37ec1b for util/src/average.cpp

Timestamp:

Apr 15, 2010, 3:05:18 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

ce0de8

Parents:

e34098

Message:

BUGFIX: Extended AverageColumnsUnitTest, found one bug in AverageColumns.

• added new test to AverageColumnsUnitTest, testing calculation of mean and deviation.
• BUGFIX: AverageColumns() calculated deviation wrongly due to cols=0 instead of cols=-1.

File:

• util/src/average.cpp (modified) (4 diffs)

util/src/average.cpp

@@ -10 +10 @@
 #include <iostream>
 #include <iomanip>
+#include <math.h>
 #include <string>
 #include <sstream>
@@ -59 +60 @@
       }
       // skip to next desired column
+      tmp = 0.;
       for(;cols!=*ColRunner;++cols)
         if (!line.eof()) // check for end of line
@@ -113 +115 @@
     lines++;
     // go through the columns
-    cols = 0;
+    cols = -1;
     for (IndexSet::const_iterator ColRunner = Columns.begin(); ColRunner != Columns.end(); ++ColRunner) {
       // skip to next desired column
+      tmp = 0.;
       for(;cols!=*ColRunner;++cols)
         if (!line.eof()) // check for end of line
@@ -132 +135 @@
   // go through each value in Results and take std deviation
   for (MeanErrorMap::iterator Runner = Values->begin(); Runner != Values->end(); ++Runner)
-    if (CountMap[Runner->first] != 0)
-      Runner->second.second /= CountMap[Runner->first];
-    else
+    if (CountMap[Runner->first] != 0) {
+      tmp = Runner->second.second;
+      Runner->second.second = sqrt(tmp)/CountMap[Runner->first];
+    } else
       cerr << "For column " << CountMap[Runner->first] << " no entries have been found." << endl;