Changeset 5a2599 for molecuilder/src

Timestamp:

Apr 26, 2010, 4:13:02 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

732da7

Parents:

bb50e0 (diff), 424890 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'FixAnalysisCorrelation_zeroinitallbins' into Analysis_PairCorrelation

File:

• molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp (modified) (2 diffs)

molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp

@@ -118 +118 @@
   // put pair correlation into bins and check with no range
   binmap = BinData( pointmap, 0.5, 0., 0. );
-  CPPUNIT_ASSERT_EQUAL( (size_t)2, binmap->size() );
-  //OutputCorrelation ( binmap );
+  OutputCorrelation ( (ofstream *)&cout, binmap );
+  CPPUNIT_ASSERT_EQUAL( (size_t)3, binmap->size() );
   tester = binmap->begin();
   CPPUNIT_ASSERT_EQUAL( 1., tester->first );
@@ -131 +131 @@
   // ... and check with [0., 2.] range
   binmap = BinData( pointmap, 0.5, 0., 2. );
+  OutputCorrelation ( (ofstream *)&cout, binmap );
   CPPUNIT_ASSERT_EQUAL( (size_t)5, binmap->size() );
-  //OutputCorrelation ( binmap );
   tester = binmap->begin();
   CPPUNIT_ASSERT_EQUAL( 0., tester->first );