Changeset bb50e0 for molecuilder/src

Timestamp:

Apr 26, 2010, 4:04:41 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

5a2599

Parents:

d1829c (diff), a3c47c (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

Conflicts:

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

There have been conflicts due to shifted OutputCorrelation() and being commented-out in one commit, not in the other though.

Signed-off-by: Frederik Heber <heber@…>

File:

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

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -197 +197 @@
   // put pair correlation into bins and check with no range
   binmap = BinData( surfacemap, 0.5, 0., 0. );
-  CPPUNIT_ASSERT_EQUAL( (size_t)2, binmap->size() );
-  OutputCorrelation ( (ofstream *)&cout, binmap );
+  //OutputCorrelation ( (ofstream *)&cout, binmap );
+  CPPUNIT_ASSERT_EQUAL( (size_t)9, binmap->size() );
   // inside point is first and must have negative value
   tester = binmap->lower_bound(4.25-0.5); // start depends on the min value and
@@ -216 +216 @@
   // ... and check with [0., 2.] range
   binmap = BinData( surfacemap, 0.5, -2., 4. );
+  //OutputCorrelation ( (ofstream *)&cout, binmap );
   CPPUNIT_ASSERT_EQUAL( (size_t)13, binmap->size() );
-//  OutputCorrelation ( (ofstream *)&cout, binmap );
   // three outside points
   tester = binmap->lower_bound(4.25-0.5);