Changeset 438506 for molecuilder

Timestamp:

Jul 9, 2009, 11:40:14 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

8bbe43

Parents:

ab7b5e7

Message:

Fixed all of the remaining memory leaks due to CandidatesForTesselation list.

• Opt_Candidates list in Find_next_suitable_triangle() and Find_starting_triangle() was not deleted
• Also, all contained CandidatesForTesselation were not deleted
• the candidates list was cleared in Find_third_point_for_Tesselation() but the contained CandidatesForTesselation were not deleted

File:

• molecuilder/src/boundary.cpp (modified) (8 diffs)

molecuilder/src/boundary.cpp

@@ -249 +249 @@
 CandidateForTesselation::~CandidateForTesselation() {
         point = NULL;
+        BaseLine = NULL;
 }
 
@@ -1912 +1913 @@
   int N[NDIM], Nlower[NDIM], Nupper[NDIM];
   atom *Candidate = NULL;
-  CandidateForTesselation *optCandidate;
+  CandidateForTesselation *optCandidate = NULL;
 
   cout << Verbose(1) << "Begin of Find_third_point_for_Tesselation" << endl;
@@ -2021 +2022 @@
                             << alpha << " and circumsphere's center at " << optCandidate->OptCenter << "." << endl;
                         } else {
+                          // remove all candidates from the list and then the list itself
+                          class CandidateForTesselation *remover = NULL;
+                          for (CandidateList::iterator it = candidates->begin(); it != candidates->end(); ++it) {
+                            remover = *it;
+                            delete(remover);
+                          }
                           candidates->clear();
                           candidates->push_back(optCandidate);
@@ -2408 +2415 @@
   );
   cout << Verbose(1) << "Third Points are ";
-  CandidateList::iterator it;
-  for (it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
       cout << " " << *(*it)->point;
   }
   cout << endl;
 
-  for (it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
           // add third triangle point
           AddTrianglePoint((*it)->point, 2);
@@ -2440 +2446 @@
           }
   }
+  // remove all candidates from the list and then the list itself
+  class CandidateForTesselation *remover = NULL;
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+    remover = *it;
+    delete(remover);
+  }
+  delete(Opt_Candidates);
   cout << Verbose(2) << "Projection is " << BTS->NormalVector.Projection(&Oben) << "." << endl;
   cout << Verbose(1) << "End of Find_starting_triangle\n";
@@ -2572 +2585 @@
   }
   cout << Verbose(1) << "Third Points are ";
-  CandidateList::iterator it;
-  for (it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
           cout << " " << *(*it)->point;
   }
@@ -2579 +2591 @@
 
   BoundaryLineSet *BaseRay = &Line;
-  for (it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
           cout << Verbose(1) << " Third point candidate is " << *(*it)->point
                 << " with circumsphere's center at " << (*it)->OptCenter << "." << endl;
@@ -2701 +2713 @@
     // set baseline to new ray from ref point (here endpoints[0]->node) to current candidate (here (*it)->point))
           BaseRay = BLS[0];
-//    LineMap::iterator LineIterator = Line.endpoints[0]->lines.find((*it)->point->nr);
-//    for (; LineIterator != Line.endpoints[0]->lines.end(); LineIterator++) {
-//      if ((*LineIterator->second).TrianglesCount != 2)
-//        break;
-//    }
-//    if (LineIterator == Line.endpoints[0]->lines.end())
-//      cout << Verbose(1) << "ERROR: I could not find a suitable line with less than two triangles connected!" << endl;
-  }
-
+  }
+
+  // remove all candidates from the list and then the list itself
+  class CandidateForTesselation *remover = NULL;
+  for (CandidateList::iterator it = Opt_Candidates->begin(); it != Opt_Candidates->end(); ++it) {
+    remover = *it;
+    delete(remover);
+  }
+  delete(Opt_Candidates);
   cout << Verbose(1) << "End of Find_next_suitable_triangle\n";
   return result;