Changeset 543ce4 for molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

Timestamp:

Nov 4, 2009, 7:56:04 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4ef101, aa8542

Parents:

ec70ec

Message:

Huge change from ofstream * (const) out --> Log().

• first shift was done via regular expressions
• then via error messages from the code
• note that class atom, class element and class molecule kept in parts their output stream, was they print to file.
• make check runs fine
• MISSING: Verbosity is not fixed for everything (i.e. if no endl; is present and next has Verbose(0) ...)

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

File:

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

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -85 +85 @@
   // init tesselation and linked cell
   Surface = new Tesselation;
-  FindNonConvexBorder((ofstream *)&cerr, TestMolecule, Surface, (const LinkedCell *&)LC, 2.5, NULL);
+  FindNonConvexBorder(TestMolecule, Surface, (const LinkedCell *&)LC, 2.5, NULL);
   LC = new LinkedCell(TestMolecule, 5.);
   CPPUNIT_ASSERT_EQUAL( (size_t)4, Surface->PointsOnBoundary.size() );
@@ -137 +137 @@
 {
   // do the pair correlation
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( TestList, hydrogen, Surface, LC );
   CPPUNIT_ASSERT( surfacemap != NULL );
   CPPUNIT_ASSERT_EQUAL( (size_t)4, surfacemap->size() );
@@ -145 +145 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( TestList, hydrogen, Surface, LC );
   // put pair correlation into bins and check with no range
-  binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 0. );
+  binmap = BinData( surfacemap, 0.5, 0., 0. );
   CPPUNIT_ASSERT_EQUAL( (size_t)1, binmap->size() );
-  //OutputCorrelation ( (ofstream *)&cout, binmap );
+  //OutputCorrelation ( binmap );
   tester = binmap->begin();
   CPPUNIT_ASSERT_EQUAL( 0., tester->first );
@@ -159 +159 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, hydrogen, Surface, LC );
+  surfacemap = CorrelationToSurface( TestList, hydrogen, Surface, LC );
   // ... and check with [0., 2.] range
-  binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 2. );
+  binmap = BinData( surfacemap, 0.5, 0., 2. );
   CPPUNIT_ASSERT_EQUAL( (size_t)5, binmap->size() );
-  //OutputCorrelation ( (ofstream *)&cout, binmap );
+  //OutputCorrelation ( binmap );
   tester = binmap->begin();
   CPPUNIT_ASSERT_EQUAL( 0., tester->first );
@@ -176 +176 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, carbon, Surface, LC );
+  surfacemap = CorrelationToSurface( TestList, carbon, Surface, LC );
   // put pair correlation into bins and check with no range
-  binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, 0., 0. );
+  binmap = BinData( surfacemap, 0.5, 0., 0. );
   CPPUNIT_ASSERT_EQUAL( (size_t)2, binmap->size() );
   OutputCorrelation ( (ofstream *)&cout, binmap );
@@ -194 +194 @@
 {
   BinPairMap::iterator tester;
-  surfacemap = CorrelationToSurface( (ofstream *)&cout, TestList, carbon, Surface, LC );
+  surfacemap = CorrelationToSurface( TestList, carbon, Surface, LC );
   // ... and check with [0., 2.] range
-  binmap = BinData( (ofstream *)&cout, surfacemap, 0.5, -2., 4. );
+  binmap = BinData( surfacemap, 0.5, -2., 4. );
   CPPUNIT_ASSERT_EQUAL( (size_t)13, binmap->size() );
   OutputCorrelation ( (ofstream *)&cout, binmap );