Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/unittests/tesselation_insideoutsideunittest.cpp

    rd74077 r952f38  
    1313
    1414#include <cstring>
    15 #include <iostream>
    1615
    1716#include "defs.hpp"
    18 #include "TesselPoint.hpp"
    19 #include "BoundaryLineSet.hpp"
    20 #include "BoundaryTriangleSet.hpp"
    21 #include "CandidateForTesselation.hpp"
     17#include "tesselation.hpp"
    2218#include "tesselation_insideoutsideunittest.hpp"
    23 #include "verbose.hpp"
     19#include "Helpers/Verbose.hpp"
    2420
    2521#ifdef HAVE_TESTRUNNER
     
    3430CPPUNIT_TEST_SUITE_REGISTRATION( TesselationInOutsideTest );
    3531
     32
    3633void TesselationInOutsideTest::setUp()
    3734{
     
    4138  class TesselPoint *Walker;
    4239  Walker = new TesselPoint;
    43   Walker->setPosition(Vector(0., 0., 0.));
     40  Walker->node = new Vector(0., 0., 0.);
    4441  Walker->setName("1");
    4542  Walker->nr = 1;
    4643  Corners.push_back(Walker);
    4744  Walker = new TesselPoint;
    48   Walker->setPosition(Vector(0., 1., 0.));
     45  Walker->node = new Vector(0., 1., 0.);
    4946  Walker->setName("2");
    5047  Walker->nr = 2;
    5148  Corners.push_back(Walker);
    5249  Walker = new TesselPoint;
    53   Walker->setPosition(Vector(1., 0., 0.));
     50  Walker->node = new Vector(1., 0., 0.);
    5451  Walker->setName("3");
    5552  Walker->nr = 3;
    5653  Corners.push_back(Walker);
    5754  Walker = new TesselPoint;
    58   Walker->setPosition(Vector(1., 1., 0.));
     55  Walker->node = new Vector(1., 1., 0.);
    5956  Walker->setName("4");
    6057  Walker->nr = 4;
    6158  Corners.push_back(Walker);
    6259  Walker = new TesselPoint;
    63   Walker->setPosition(Vector(0., 0., 1.));
     60  Walker->node = new Vector(0., 0., 1.);
    6461  Walker->setName("5");
    6562  Walker->nr = 5;
    6663  Corners.push_back(Walker);
    6764  Walker = new TesselPoint;
    68   Walker->setPosition(Vector(0., 1., 1.));
     65  Walker->node = new Vector(0., 1., 1.);
    6966  Walker->setName("6");
    7067  Walker->nr = 6;
    7168  Corners.push_back(Walker);
    7269  Walker = new TesselPoint;
    73   Walker->setPosition(Vector(1., 0., 1.));
     70  Walker->node = new Vector(1., 0., 1.);
    7471  Walker->setName("7");
    7572  Walker->nr = 7;
    7673  Corners.push_back(Walker);
    7774  Walker = new TesselPoint;
    78   Walker->setPosition(Vector(1., 1., 1.));
     75  Walker->node = new Vector(1., 1., 1.);
    7976  Walker->setName("8");
    8077  Walker->nr = 8;
     
    133130  delete(LinkedList);
    134131  delete(TesselStruct);
    135   for (LinkedCell::LinkedNodes::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++)
     132  for (LinkedCell::LinkedNodes::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++) {
     133    delete((*Runner)->node);
    136134    delete(*Runner);
     135  }
    137136  Corners.clear();
    138137  logger::purgeInstance();
Note: See TracChangeset for help on using the changeset viewer.