Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Tesselation/unittests/Tesselation_BoundaryTriangleUnitTest.cpp

    rc1d78c r6a7fcbb  
    5454void TesselationBoundaryTriangleTest::createTriangle(const std::vector<Vector> &Vectors)
    5555{
    56   CPPUNIT_ASSERT_EQUAL( (size_t)NDIM, Vectors.size() );
     56  CPPUNIT_ASSERT_EQUAL( (size_t)3, Vectors.size() );
    5757
    5858  // create nodes
    … …  
    7676}
    7777
    78 /** This cleanly removes a triangle created via createTriangle() from memory.
    79  *
    80  */
    81 void TesselationBoundaryTriangleTest::removeTriangle()
    82 {
    83   delete(triangle);
    84   for (int i=0;i<NDIM;++i) {
    85     // TesselPoint does not delete its vector as it only got a reference
    86     delete tesselpoints[i];
    87   }
    88 }
    89 
    9078void TesselationBoundaryTriangleTest::setUp()
    9179{
    … …  
    10492void TesselationBoundaryTriangleTest::tearDown()
    10593{
    106   removeTriangle();
     94  delete(triangle);
     95  for (int i=0;i<3;++i) {
     96    // TesselPoint does not delete its vector as it only got a reference
     97    delete tesselpoints[i];
     98  }
    10799  logger::purgeInstance();
    108100  errorLogger::purgeInstance();
    … …  
    195187{
    196188  {
    197     removeTriangle();
     189    delete triangle;
    198190    // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
    199191    // failure is: Intersection (23.1644,24.1867,65.1272) is not inside triangle [659|Na2451,O3652,Na3762].
    … …  
    208200  }
    209201  {
    210     removeTriangle();
     202    delete triangle;
    211203    // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
    212204    // failure is: Intersection (20.6787,70.655,71.5657) is not inside triangle [622|Na1197,Na2166,O3366].
    … …  
    222214  }
    223215  {
    224     removeTriangle();
     216    delete triangle;
    225217    // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
    226218    // failure is:Intersection (27.56537519896,13.40256646925,6.672946688134) is not inside triangle [702|Na5016,O6388,Na6498].
    … …  
    262254  }
    263255
    264   removeTriangle();
     256  delete triangle;
    265257  // create better triangle;
    266258  VECTORSET(std::vector) Vectors;
    … …  
    297289{
    298290  {
    299     removeTriangle();
     291    delete triangle;
    300292    // test is from --create-micelle 200 --radius 30. --position "0,0,0" of sles.data
    301293    // failure is:Intersection (27.56537519896,13.40256646925,6.672946688134) is not inside triangle [702|Na5016,O6388,Na6498].
Note: See TracChangeset for help on using the changeset viewer.