Changeset 37ec1b for util/src/unittests/AverageColumnsUnitTest.cpp

Timestamp:

Apr 15, 2010, 3:05:18 PM (16 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/unittests/AverageColumnsUnitTest.cpp (modified) (3 diffs)

util/src/unittests/AverageColumnsUnitTest.cpp

@@ -11 +11 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+
+#include <math.h>
 
 #include "../average.hpp"
@@ -36 +38 @@
 /** UnitTest for calculations in AverageColumns().
  */
-void AverageColumnsTest::CalculationsTest()
+void AverageColumnsTest::SimpleCalculationsTest()
 {
-  // fill stream
   input.str("1\n1\n1\n");
   Columns.insert(0);
@@ -47 +48 @@
   CPPUNIT_ASSERT_EQUAL( 1., mean );
   CPPUNIT_ASSERT_EQUAL( 0., dev );
-};
+}
+
+/** UnitTest for some real calculations in AverageColumns().
+ */
+void AverageColumnsTest::CalculationsTest()
+{
+  MeanErrorMap::iterator Runner;
+  input.clear();
+  input.str("1.\t1.\n2.\t3.\n3.\t5.\n");
+  Columns.insert(0);
+  Columns.insert(1);
+  Results = AverageColumns(input, Columns);
+  Runner = Results->begin();
+  CPPUNIT_ASSERT ( Runner != Results->end() );
+  CPPUNIT_ASSERT_EQUAL( 2., (*Runner).second.first );
+  CPPUNIT_ASSERT_EQUAL( sqrt(2)/3., (*Runner).second.second );
+  Runner++;
+  CPPUNIT_ASSERT ( Runner != Results->end() );
+  CPPUNIT_ASSERT_EQUAL( 3., (*Runner).second.first );
+  CPPUNIT_ASSERT_EQUAL( sqrt(8.)/3., (*Runner).second.second );
+}
 
 /** UnitTest for too few columns in AverageColumns().