Changeset a9b2a0a for molecuilder/src/unittests

Timestamp:

Oct 27, 2009, 4:11:22 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

069034

Parents:

55a71b

Message:

Huge refactoring to make const what is const (ticket #38), continued.

• too many changes because of too many cross-references to be able to list them up here.
• NOTE that "make check" runs fine and did catch several error.
• note that we had to use const_iterator several times when the map, ... was declared const.
• at times we changed an allocated LinkedCell LCList(...) into

const LinkedCell *LCList;
LCList = new LinkedCell(...);

• also mutable (see ticket #5) was used, e.g. for molecule::InternalPointer (PointCloud changes are allowed, because they are just accounting).

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

Location:

molecuilder/src/unittests

Files:

• ActOnAllUnitTest.cpp (modified) (2 diffs)
• AnalysisCorrelationToPointUnitTest.cpp (modified) (1 diff)
• AnalysisCorrelationToSurfaceUnitTest.cpp (modified) (2 diffs)

molecuilder/src/unittests/ActOnAllUnitTest.cpp

@@ -62 +62 @@
 
   // scaling by value
-  VL.ActOnAll( (void (Vector::*)(double)) &Vector::Scale, 2. );
+  VL.ActOnAll( (void (Vector::*)(const double)) &Vector::Scale, 2. );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAll( (void (Vector::*)(double)) &Vector::Scale, 0.5 );
+  VL.ActOnAll( (void (Vector::*)(const double)) &Vector::Scale, 0.5 );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 
   // scaling by ref
-  VL.ActOnAll( (void (Vector::*)(double *)) &Vector::Scale, &factor );
+  VL.ActOnAll( (void (Vector::*)(const double * const)) &Vector::Scale, (const double * const)&factor );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAll( (void (Vector::*)(double *)) &Vector::Scale, &inverse );
+  VL.ActOnAll( (void (Vector::*)(const double * const)) &Vector::Scale, (const double * const)&inverse );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 
@@ -82 +82 @@
     inverses[i] = 1./factors[i];
   }
-  VL.ActOnAll( (void (Vector::*)(double **)) &Vector::Scale, &factors );
+  VL.ActOnAll( (void (Vector::*)(const double ** const)) &Vector::Scale, (const double ** const)&factors );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , false );
 
-  VL.ActOnAll( (void (Vector::*)(double **)) &Vector::Scale, &inverses );
+  VL.ActOnAll( (void (Vector::*)(const double ** const)) &Vector::Scale, (const double ** const)&inverses );
   CPPUNIT_ASSERT_EQUAL( VL == Ref , true );
 };

molecuilder/src/unittests/AnalysisCorrelationToPointUnitTest.cpp

@@ -77 +77 @@
 
   // init maps
-  pointmap = CorrelationToPoint( (ofstream *)&cout, TestMolecule, hydrogen, point );
+  pointmap = CorrelationToPoint( (ofstream *)&cout, (const molecule * const)TestMolecule, (const element * const)hydrogen, (const Vector *)point );
   binmap = NULL;
 

molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp

@@ -81 +81 @@
   // init tesselation and linked cell
   Surface = new Tesselation;
-  TestMolecule->TesselStruct = Surface;
-  FindNonConvexBorder((ofstream *)&cerr, TestMolecule, LC, 2.5, NULL);
+  FindNonConvexBorder((ofstream *)&cerr, TestMolecule, Surface, (const LinkedCell *&)LC, 2.5, NULL);
   LC = new LinkedCell(TestMolecule, 5.);
   CPPUNIT_ASSERT_EQUAL( (size_t)4, Surface->PointsOnBoundary.size() );
@@ -123 +122 @@
   // remove
   delete(TestMolecule);
-  // note that Surface and all the atoms are cleaned by TestMolecule
+  delete(Surface);
+  // note that all the atoms are cleaned by TestMolecule
   delete(LC);
   delete(tafel);