Changeset be2997 for molecuilder/src/builder.cpp

Timestamp:

Nov 25, 2009, 3:29:18 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

3aa635

Parents:

edf611

Message:

Multi-Candidate-Add included and incorporated class Info into boundary.cpp, tesselation.cpp and tesselationhelpers.cpp

• class Info incorporation:
  • (almost) all functions of boundary.cpp, tesselation.cpp and tesselationhelpers.cpp now begins with class Info FunctionName(func);

• Multi-Candidate-Add:
  • CandidateForTesselation now contains a pointlist instead of a single point
  • Tesselation::AddCandidateTriangle() adds an polygon (for multiple candidates) instead of a single triangle.
  • HasOtherBaselineBetterCandidate() was commented out (it is to be checked whether we really need this)
  • Tesselation::FindNextSuitableTriangle() is reduced to pre-calculation of centers and calling Tesselation::FindThirdPointForTesselation()
  • Tesselation::FindThirdPointForTesselation() now fills the CandidateForTesselation::pointlist
  • Tesselation::FindStartingTriangle() now creates a CandidateForTesselation inside the NDIM-loop and Tesselation::FindThirdPointForTesselation() fills it.

File:

• molecuilder/src/builder.cpp (modified) (2 diffs)

molecuilder/src/builder.cpp

@@ -1577 +1577 @@
                   molecules->ListOfMolecules.remove(mol);
                   molecules->DissectMoleculeIntoConnectedSubgraphs(mol,&configuration);
+                  delete(mol);
                   if (molecules->ListOfMolecules.size() != 0) {
                     for (MoleculeList::iterator ListRunner = molecules->ListOfMolecules.begin(); ListRunner != molecules->ListOfMolecules.end(); ListRunner++)
@@ -1807 +1808 @@
                 Log() << Verbose(0) << "Clocks for this operation: " << (end-start) << ", time: " << ((double)(end-start)/CLOCKS_PER_SEC) << "s." << endl;
                 delete(LCList);
+                delete(T);
                 argptr+=2;
               }