Changeset a9b2a0a for molecuilder/src/tesselation.cpp

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@…>

File:

• molecuilder/src/tesselation.cpp (modified) (52 diffs)

molecuilder/src/tesselation.cpp

@@ -31 +31 @@
  * \param *Walker TesselPoint this boundary point represents
  */
-BoundaryPointSet::BoundaryPointSet(TesselPoint *Walker)
+BoundaryPointSet::BoundaryPointSet(TesselPoint * Walker)
 {
   node = Walker;
@@ -73 +73 @@
  * \param &a boundary point
  */
-ostream & operator <<(ostream &ost, BoundaryPointSet &a)
+ostream & operator <<(ostream &ost, const BoundaryPointSet &a)
 {
   ost << "[" << a.Nr << "|" << a.node->Name << " at " << *a.node->node << "]";
@@ -96 +96 @@
  * \param number number of the list
  */
-BoundaryLineSet::BoundaryLineSet(class BoundaryPointSet *Point[2], int number)
+BoundaryLineSet::BoundaryLineSet(class BoundaryPointSet *Point[2], const int number)
 {
   // set number
@@ -275 +275 @@
  * \param &a boundary line
  */
-ostream & operator <<(ostream &ost, BoundaryLineSet &a)
+ostream & operator <<(ostream &ost, const  BoundaryLineSet &a)
 {
   ost << "[" << a.Nr << "|" << a.endpoints[0]->node->Name << " at " << *a.endpoints[0]->node->node << "," << a.endpoints[1]->node->Name << " at " << *a.endpoints[1]->node->node << "]";
@@ -532 +532 @@
  * \param &a boundary triangle
  */
-ostream &operator <<(ostream &ost, BoundaryTriangleSet &a)
+ostream &operator <<(ostream &ost, const BoundaryTriangleSet &a)
 {
   ost << "[" << a.Nr << "|" << a.endpoints[0]->node->Name << " at " << *a.endpoints[0]->node->node << ","
@@ -642 +642 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-Vector * Tesselation::GetCenter(ofstream *out)
+Vector * Tesselation::GetCenter(ofstream *out) const
 {
   Vector *Center = new Vector(0.,0.,0.);
@@ -657 +657 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-TesselPoint * Tesselation::GetPoint()
+TesselPoint * Tesselation::GetPoint() const
 {
   return (InternalPointer->second->node);
@@ -665 +665 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-TesselPoint * Tesselation::GetTerminalPoint()
-{
-  PointMap::iterator Runner = PointsOnBoundary.end();
+TesselPoint * Tesselation::GetTerminalPoint() const
+{
+  PointMap::const_iterator Runner = PointsOnBoundary.end();
   Runner--;
   return (Runner->second->node);
@@ -675 +675 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-void Tesselation::GoToNext()
+void Tesselation::GoToNext() const
 {
   if (InternalPointer != PointsOnBoundary.end())
@@ -684 +684 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-void Tesselation::GoToPrevious()
+void Tesselation::GoToPrevious() const
 {
   if (InternalPointer != PointsOnBoundary.begin())
@@ -693 +693 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-void Tesselation::GoToFirst()
+void Tesselation::GoToFirst() const
 {
   InternalPointer = PointsOnBoundary.begin();
@@ -700 +700 @@
 /** PointCloud implementation of GoToLast.
  * Uses PointsOnBoundary and STL stuff.
- */   
-void Tesselation::GoToLast()
+ */
+void Tesselation::GoToLast() const
 {
   InternalPointer = PointsOnBoundary.end();
@@ -710 +710 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-bool Tesselation::IsEmpty()
+bool Tesselation::IsEmpty() const
 {
   return (PointsOnBoundary.empty());
@@ -718 +718 @@
  * Uses PointsOnBoundary and STL stuff.
  */   
-bool Tesselation::IsEnd()
+bool Tesselation::IsEnd() const
 {
   return (InternalPointer == PointsOnBoundary.end());
@@ -899 +899 @@
  * \param *cloud cluster of points
  */
-void Tesselation::TesselateOnBoundary(ofstream *out, PointCloud *cloud)
+void Tesselation::TesselateOnBoundary(ofstream *out, const PointCloud * const cloud)
 {
   bool flag;
@@ -1097 +1097 @@
  * \return true - all straddling points insert, false - something went wrong
  */
-bool Tesselation::InsertStraddlingPoints(ofstream *out, PointCloud *cloud, LinkedCell *LC)
+bool Tesselation::InsertStraddlingPoints(ofstream *out, const PointCloud *cloud, const LinkedCell *LC)
 {
   Vector Intersection, Normal;
@@ -1207 +1207 @@
  * \return true - new point was added, false - point already present
  */
-bool
-Tesselation::AddBoundaryPoint(TesselPoint *Walker, int n)
+bool Tesselation::AddBoundaryPoint(TesselPoint * Walker, const int n)
 {
   PointTestPair InsertUnique;
@@ -1229 +1228 @@
  * @param n index for this point in Tesselation::TPS array
  */
-void
-Tesselation::AddTesselationPoint(TesselPoint* Candidate, int n)
+void Tesselation::AddTesselationPoint(TesselPoint* Candidate, const int n)
 {
   PointTestPair InsertUnique;
@@ -1252 +1250 @@
  * @param n index of Tesselation::BLS giving the line with both endpoints
  */
-void Tesselation::AddTesselationLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n) {
+void Tesselation::AddTesselationLine(class BoundaryPointSet *a, class BoundaryPointSet *b, const int n) {
   bool insertNewLine = true;
 
@@ -1290 +1288 @@
  * @param n index of Tesselation::BLS giving the line with both endpoints
  */
-void Tesselation::AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n)
+void Tesselation::AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, const int n)
 {
   cout << Verbose(4) << "Adding line [" << LinesOnBoundaryCount << "|" << *(a->node) << " and " << *(b->node) << "." << endl;
@@ -1323 +1321 @@
  * \param nr triangle number
  */
-void Tesselation::AddTesselationTriangle(int nr)
+void Tesselation::AddTesselationTriangle(const int nr)
 {
   cout << Verbose(1) << "Adding triangle to global TrianglesOnBoundary map." << endl;
@@ -1554 +1552 @@
  * \param *LC LinkedCell structure with neighbouring TesselPoint's
  */
-void Tesselation::FindStartingTriangle(ofstream *out, const double RADIUS, LinkedCell *LC)
+void Tesselation::FindStartingTriangle(ofstream *out, const double RADIUS, const LinkedCell *LC)
 {
   cout << Verbose(1) << "Begin of FindStartingTriangle\n";
   int i = 0;
-  LinkedNodes *List = NULL;
   TesselPoint* FirstPoint = NULL;
   TesselPoint* SecondPoint = NULL;
@@ -1580 +1577 @@
     for (LC->n[(i+1)%NDIM]=0;LC->n[(i+1)%NDIM]<LC->N[(i+1)%NDIM];LC->n[(i+1)%NDIM]++)
       for (LC->n[(i+2)%NDIM]=0;LC->n[(i+2)%NDIM]<LC->N[(i+2)%NDIM];LC->n[(i+2)%NDIM]++) {
-        List = LC->GetCurrentCell();
+        const LinkedNodes *List = LC->GetCurrentCell();
         //cout << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
         if (List != NULL) {
-          for (LinkedNodes::iterator Runner = List->begin();Runner != List->end();Runner++) {
+          for (LinkedNodes::const_iterator Runner = List->begin();Runner != List->end();Runner++) {
             if ((*Runner)->node->x[i] > maxCoordinate[i]) {
               cout << Verbose(2) << "New maximal for axis " << i << " node is " << *(*Runner) << " at " << *(*Runner)->node << "." << endl;
@@ -1645 +1642 @@
 
     //cout << Verbose(2) << "INFO: OldSphereCenter is at " << helper << ".\n";
-    FindThirdPointForTesselation(
-      Oben, SearchDirection, helper, BLS[0], NULL, *&OptCandidates, &ShortestAngle, RADIUS, LC
-    );
+    FindThirdPointForTesselation(Oben, SearchDirection, helper, BLS[0], NULL, *&OptCandidates, &ShortestAngle, RADIUS, LC);
     cout << Verbose(1) << "List of third Points is ";
     for (CandidateList::iterator it = OptCandidates->begin(); it != OptCandidates->end(); ++it) {
@@ -1713 +1708 @@
  * @param *LC LinkedCell structure with neighbouring points
  */
-bool Tesselation::FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, LinkedCell *LC)
+bool Tesselation::FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC)
 {
   cout << Verbose(0) << "Begin of FindNextSuitableTriangle\n";
@@ -1774 +1769 @@
 
     // add third point
-    FindThirdPointForTesselation(
-      T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, OptCandidates,
-      &ShortestAngle, RADIUS, LC
-    );
+    FindThirdPointForTesselation(T.NormalVector, SearchDirection, OldSphereCenter, &Line, ThirdNode, OptCandidates, &ShortestAngle, RADIUS, LC);
 
   } else {
@@ -1813 +1805 @@
       AddTesselationPoint(BaseRay->endpoints[1]->node, 2);
 
-      if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
+      if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet **)TPS)) {
         AddTesselationLine(TPS[0], TPS[1], 0);
         AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1842 +1834 @@
         // We demand that at most one new degenerate line is created and that this line also already exists (which has to be the case due to existentTrianglesCount == 1)
         // i.e. at least one of the three lines must be present with TriangleCount <= 1
-        if (CheckLineCriteriaForDegeneratedTriangle(TPS)) {
+        if (CheckLineCriteriaForDegeneratedTriangle((const BoundaryPointSet **)TPS)) {
           AddTesselationLine(TPS[0], TPS[1], 0);
           AddTesselationLine(TPS[0], TPS[2], 1);
@@ -1949 +1941 @@
 };
 
-void Tesselation::PrintAllBoundaryPoints(ofstream *out)
+void Tesselation::PrintAllBoundaryPoints(ofstream *out) const
 {
   // print all lines
   *out << Verbose(1) << "Printing all boundary points for debugging:" << endl;
-  for (PointMap::iterator PointRunner = PointsOnBoundary.begin();PointRunner != PointsOnBoundary.end(); PointRunner++)
+  for (PointMap::const_iterator PointRunner = PointsOnBoundary.begin();PointRunner != PointsOnBoundary.end(); PointRunner++)
     *out << Verbose(2) << *(PointRunner->second) << endl;
 };
 
-void Tesselation::PrintAllBoundaryLines(ofstream *out)
+void Tesselation::PrintAllBoundaryLines(ofstream *out) const
 {
   // print all lines
   *out << Verbose(1) << "Printing all boundary lines for debugging:" << endl;
-  for (LineMap::iterator LineRunner = LinesOnBoundary.begin(); LineRunner != LinesOnBoundary.end(); LineRunner++)
+  for (LineMap::const_iterator LineRunner = LinesOnBoundary.begin(); LineRunner != LinesOnBoundary.end(); LineRunner++)
     *out << Verbose(2) << *(LineRunner->second) << endl;
 };
 
-void Tesselation::PrintAllBoundaryTriangles(ofstream *out)
+void Tesselation::PrintAllBoundaryTriangles(ofstream *out) const
 {
   // print all triangles
   *out << Verbose(1) << "Printing all boundary triangles for debugging:" << endl;
-  for (TriangleMap::iterator TriangleRunner = TrianglesOnBoundary.begin(); TriangleRunner != TrianglesOnBoundary.end(); TriangleRunner++)
+  for (TriangleMap::const_iterator TriangleRunner = TrianglesOnBoundary.begin(); TriangleRunner != TrianglesOnBoundary.end(); TriangleRunner++)
     *out << Verbose(2) << *(TriangleRunner->second) << endl;
 };
@@ -2165 +2157 @@
  * \param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::FindSecondPointForTesselation(TesselPoint* a, Vector Oben, TesselPoint*& OptCandidate, double Storage[3], double RADIUS, LinkedCell *LC)
+void Tesselation::FindSecondPointForTesselation(TesselPoint* a, Vector Oben, TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC)
 {
   cout << Verbose(2) << "Begin of FindSecondPointForTesselation" << endl;
   Vector AngleCheck;
   class TesselPoint* Candidate = NULL;
-  double norm = -1., angle;
-  LinkedNodes *List = NULL;
-  int N[NDIM], Nlower[NDIM], Nupper[NDIM];
+  double norm = -1.;
+  double angle = 0.;
+  int N[NDIM];
+  int Nlower[NDIM];
+  int Nupper[NDIM];
 
   if (LC->SetIndexToNode(a)) {  // get cell for the starting point
@@ -2198 +2192 @@
     for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
       for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-        List = LC->GetCurrentCell();
+        const LinkedNodes *List = LC->GetCurrentCell();
         //cout << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
         if (List != NULL) {
-          for (LinkedNodes::iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+          for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
             Candidate = (*Runner);
             // check if we only have one unique point yet ...
@@ -2285 +2279 @@
  * @param *LC LinkedCell structure with neighbouring points
  */
-void Tesselation::FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, LinkedCell *LC)
+void Tesselation::FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint  *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, const LinkedCell *LC)
 {
   Vector CircleCenter;  // center of the circle, i.e. of the band of sphere's centers
@@ -2294 +2288 @@
   Vector NewNormalVector;   // normal vector of the Candidate's triangle
   Vector helper, OptCandidateCenter, OtherOptCandidateCenter;
-  LinkedNodes *List = NULL;
   double CircleRadius; // radius of this circle
   double radius;
@@ -2357 +2350 @@
         for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
           for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-            List = LC->GetCurrentCell();
+            const LinkedNodes *List = LC->GetCurrentCell();
             //cout << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << "." << endl;
             if (List != NULL) {
-              for (LinkedNodes::iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+              for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
                 Candidate = (*Runner);
 
@@ -2471 +2464 @@
  * \return point which is shared or NULL if none
  */
-class BoundaryPointSet *Tesselation::GetCommonEndpoint(class BoundaryLineSet * line1, class BoundaryLineSet * line2)
-{
-  class BoundaryLineSet * lines[2] =
-    { line1, line2 };
+class BoundaryPointSet *Tesselation::GetCommonEndpoint(const BoundaryLineSet * line1, const BoundaryLineSet * line2) const
+{
+  const BoundaryLineSet * lines[2] = { line1, line2 };
   class BoundaryPointSet *node = NULL;
   map<int, class BoundaryPointSet *> OrderMap;
@@ -2502 +2494 @@
  * \return list of BoundaryTriangleSet of nearest triangles or NULL in degenerate case.
  */
-list<BoundaryTriangleSet*> * Tesselation::FindClosestTrianglesToPoint(ofstream *out, Vector *x, LinkedCell* LC)
+list<BoundaryTriangleSet*> * Tesselation::FindClosestTrianglesToPoint(ofstream *out, const Vector *x, const LinkedCell* LC) const
 {
   TesselPoint *trianglePoints[3];
@@ -2522 +2514 @@
   if (trianglePoints[0]->node->DistanceSquared(x) < MYEPSILON) {
     *out << Verbose(3) << "Point is right on a tesselation point, no nearest triangle." << endl;
-    PointMap::iterator PointRunner = PointsOnBoundary.find(trianglePoints[0]->nr);
+    PointMap::const_iterator PointRunner = PointsOnBoundary.find(trianglePoints[0]->nr);
     triangles = new list<BoundaryTriangleSet*>;
     if (PointRunner != PointsOnBoundary.end()) {
@@ -2578 +2570 @@
  * \return list of BoundaryTriangleSet of nearest triangles or NULL.
  */
-class BoundaryTriangleSet * Tesselation::FindClosestTriangleToPoint(ofstream *out, Vector *x, LinkedCell* LC)
+class BoundaryTriangleSet * Tesselation::FindClosestTriangleToPoint(ofstream *out, const Vector *x, const LinkedCell* LC) const
 {
   class BoundaryTriangleSet *result = NULL;
@@ -2614 +2606 @@
  * @return true if the point is inside the tesselation structure, false otherwise
  */
-bool Tesselation::IsInnerPoint(ofstream *out, Vector Point, LinkedCell* LC)
+bool Tesselation::IsInnerPoint(ofstream *out, const Vector &Point, const LinkedCell* const LC) const
 {
   class BoundaryTriangleSet *result = FindClosestTriangleToPoint(out, &Point, LC);
@@ -2644 +2636 @@
  * @return true if the point is inside the tesselation structure, false otherwise
  */
-bool Tesselation::IsInnerPoint(ofstream *out, TesselPoint *Point, LinkedCell* LC)
+bool Tesselation::IsInnerPoint(ofstream *out, const TesselPoint * const Point, const LinkedCell* const LC) const
 {
   return IsInnerPoint(out, *(Point->node), LC);
@@ -2655 +2647 @@
  * @return set of the all points linked to the provided one
  */
-set<TesselPoint*> * Tesselation::GetAllConnectedPoints(ofstream *out, TesselPoint* Point)
+set<TesselPoint*> * Tesselation::GetAllConnectedPoints(ofstream *out, const TesselPoint* const Point) const
 {
   set<TesselPoint*> *connectedPoints = new set<TesselPoint*>;
@@ -2665 +2657 @@
 
   // find the respective boundary point
-  PointMap::iterator PointRunner = PointsOnBoundary.find(Point->nr);
+  PointMap::const_iterator PointRunner = PointsOnBoundary.find(Point->nr);
   if (PointRunner != PointsOnBoundary.end()) {
     ReferencePoint = PointRunner->second;
@@ -2675 +2667 @@
   // little trick so that we look just through lines connect to the BoundaryPoint
   // OR fall-back to look through all lines if there is no such BoundaryPoint
-  LineMap *Lines = &LinesOnBoundary;
+  const LineMap *Lines;;
   if (ReferencePoint != NULL)
     Lines = &(ReferencePoint->lines);
-  LineMap::iterator findLines = Lines->begin();
+  else
+    Lines = &LinesOnBoundary;
+  LineMap::const_iterator findLines = Lines->begin();
   while (findLines != Lines->end()) {
    takePoint = false;
@@ -2719 +2713 @@
  * @return list of the all points linked to the provided one
  */
-list<TesselPoint*> * Tesselation::GetCircleOfConnectedPoints(ofstream *out, TesselPoint* Point, Vector *Reference)
+list<TesselPoint*> * Tesselation::GetCircleOfConnectedPoints(ofstream *out, const TesselPoint* const Point, const Vector * const Reference) const
 {
   map<double, TesselPoint*> anglesOfPoints;
@@ -2733 +2727 @@
 
   // calculate central point
-  for (set<TesselPoint*>::iterator TesselRunner = connectedPoints->begin(); TesselRunner != connectedPoints->end(); TesselRunner++)
+  for (set<TesselPoint*>::const_iterator TesselRunner = connectedPoints->begin(); TesselRunner != connectedPoints->end(); TesselRunner++)
     center.AddVector((*TesselRunner)->node);
   //*out << "Summed vectors " << center << "; number of points " << connectedPoints.size()
@@ -2796 +2790 @@
  * @return list of the all points linked to the provided one
  */
-list<list<TesselPoint*> *> * Tesselation::GetPathsOfConnectedPoints(ofstream *out, TesselPoint* Point)
+list<list<TesselPoint*> *> * Tesselation::GetPathsOfConnectedPoints(ofstream *out, const TesselPoint* const Point) const
 {
   map<double, TesselPoint*> anglesOfPoints;
@@ -2813 +2807 @@
 
   // find the respective boundary point
-  PointMap::iterator PointRunner = PointsOnBoundary.find(Point->nr);
+  PointMap::const_iterator PointRunner = PointsOnBoundary.find(Point->nr);
   if (PointRunner != PointsOnBoundary.end()) {
     ReferencePoint = PointRunner->second;
@@ -2911 +2905 @@
  * @return list of the closed paths
  */
-list<list<TesselPoint*> *> * Tesselation::GetClosedPathsOfConnectedPoints(ofstream *out, TesselPoint* Point)
+list<list<TesselPoint*> *> * Tesselation::GetClosedPathsOfConnectedPoints(ofstream *out, const TesselPoint* const Point) const
 {
   list<list<TesselPoint*> *> *ListofPaths = GetPathsOfConnectedPoints(out, Point);
@@ -2972 +2966 @@
  * \return pointer to allocated list of triangles
  */
-set<BoundaryTriangleSet*> *Tesselation::GetAllTriangles(ofstream *out, class BoundaryPointSet *Point)
+set<BoundaryTriangleSet*> *Tesselation::GetAllTriangles(ofstream *out, const BoundaryPointSet * const Point) const
 {
   set<BoundaryTriangleSet*> *connectedTriangles = new set<BoundaryTriangleSet*>;
@@ -2980 +2974 @@
   } else {
     // go through its lines and insert all triangles
-    for (LineMap::iterator LineRunner = Point->lines.begin(); LineRunner != Point->lines.end(); LineRunner++)
+    for (LineMap::const_iterator LineRunner = Point->lines.begin(); LineRunner != Point->lines.end(); LineRunner++)
       for (TriangleMap::iterator TriangleRunner = (LineRunner->second)->triangles.begin(); TriangleRunner != (LineRunner->second)->triangles.end(); TriangleRunner++) {
       connectedTriangles->insert(TriangleRunner->second);
@@ -3224 +3218 @@
  *         will usually be one, in case of degeneration, there will be two
  */
-list<BoundaryTriangleSet*> *Tesselation::FindTriangles(TesselPoint* Points[3]) 
+list<BoundaryTriangleSet*> *Tesselation::FindTriangles(const TesselPoint* const Points[3]) const
 {
   list<BoundaryTriangleSet*> *result = new list<BoundaryTriangleSet*>;
-  LineMap::iterator FindLine;
-  PointMap::iterator FindPoint;
-  TriangleMap::iterator FindTriangle;
+  LineMap::const_iterator FindLine;
+  TriangleMap::const_iterator FindTriangle;
   class BoundaryPointSet *TrianglePoints[3];
 
   for (int i = 0; i < 3; i++) {
-    FindPoint = PointsOnBoundary.find(Points[i]->nr);
+    PointMap::const_iterator FindPoint = PointsOnBoundary.find(Points[i]->nr);
     if (FindPoint != PointsOnBoundary.end()) {
       TrianglePoints[i] = FindPoint->second;
@@ -3544 +3537 @@
  * \param *cloud PointCloud structure with all nodes
  */
-void Tesselation::Output(ofstream *out, const char *filename, PointCloud *cloud)
+void Tesselation::Output(ofstream *out, const char *filename, const PointCloud * const cloud)
 {
   ofstream *tempstream = NULL;