Changeset 8bc524 for molecuilder/src/molecule_dynamics.cpp

Timestamp:

Nov 3, 2009, 12:37:55 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5f9f8b

Parents:

df0520

git-author:

Frederik Heber <heber@…> (11/03/09 08:41:45)

git-committer:

Frederik Heber <heber@…> (11/03/09 12:37:55)

Message:

Several memory bugfixes (thx valgrind).

• main() - shortened case switch after ParseCommandLineOptions()
• molecule::FragmentMolecule() - indentation around BondFragments fixed.
• LEAKFIX: main() - configuration was not destroyed in case switch.
• LEAKFIX: ~config() - BondGraph BG was not destroyed.
• LEAKFIX: ParseKeySetFile() - filename was not destroyed.
• LEAKFIX: molecule::FragmentMolecule() - BackEdgeStack (returned from DepthFirstSearchAnalysis()) was not destroyed.
• LEAKFIX: molecule::FragmentMolecule() - BondFragments was not destroyed.
• LEAKFIX: MemoryUsageObserver::~MemoryUsageObserver() -- frees all remaining unbfree'd memory
• BUGFIX: MoleculeListClass::OutputConfigForListOfFragments() - FragmentNumber was delete'd not Free'd
• BUGFIX: ParseCommandLineOptions() - Free() of ListOfLocalAtoms had FragmentCounter instead of i
• BUGFIX: ParseCommandLineOptions() had BackEdgeStack in case 'D' instead of LocalBackEdgeStack for the CycliCStructureAnalysis()
• BUGFIX: StackClass<T>::StackClass() did not initialize StackList to NULL (are pointers anyway).
• MolecularLeafWalker::FillBondStructureFromReference() - no more performs its actions recursively (just complicates things unnecessarily).
• ParseCommandLineOptions() and molecule::FragmentMolecule() adapted to MolecularLeafWalker::FillBondStructureFromReference() changes.
• DepthFirstSearchAnalysis_Init() now does all of the initialisation of DepthFirstSearchAnalysis() and get molecule instead of AtomCount and BondCount

Fixed Calloc:

• MemoryAllocatorTest::MallocTest() and MemoryAllocatorTest::CallocTest() perform test on array of 10 with writing to it (revealed Calloc() bug)
• LEAKFIX: MemoryAllocatorTest::tearDown() - instance was not free'd
• BUGFIX: Calloc() - calloc() is called with num and sizeof, not num and initial_value!
• FIX: Malloc() to Calloc(): CreateFatherLookupTable(), molecule::IsEqualToWithinThreshold(), molecule::ConstrainedPotential(), PrintPermutationMap(), FillDistanceList() (initialization not needed anymore due to Calloc(), molecule::MinimiseConstrainedPotential(), molecule::ParseOrderAtSiteFromFile(), StoreFragmentFromKeySet_Init() (initialization not needed anymore due to Calloc(), molecule::StoreFragmentFromKeySet(), molecule::PowerSetGenerator(), molecule::FragmentBOSSANOVA(), molecule::ScanForPeriodicCorrection(), molecule::CreateAdjacencyList(), InitializeBFSAccounting(), BreadthFirstSearchAdd_Init(), BuildInducedSubgraph_Init(), MoleculeListClass::AddHydrogenCorrection(), MoleculeLeafClass::FillListOfLocalAtoms(), MoleculeLeafClass::AssignKeySetsToFragment(), StackClass<T>::StackClass()

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/molecule_dynamics.cpp (modified) (3 diffs)

molecuilder/src/molecule_dynamics.cpp

@@ -193 +193 @@
 {
   stringstream zeile1, zeile2;
-  int *DoubleList = Malloc<int>(AtomCount, "PrintPermutationMap: *DoubleList");
+  int *DoubleList = Calloc<int>(AtomCount, "PrintPermutationMap: *DoubleList");
   int doubles = 0;
-  for (int i=0;i<AtomCount;i++)
-    DoubleList[i] = 0;
   zeile1 << "PermutationMap: ";
   zeile2 << "                ";
@@ -243 +241 @@
 void CreateInitialLists(ofstream *out, molecule *mol, struct EvaluatePotential &Params)
 {
-  for (int i=mol->AtomCount; i--;)
-    Params.DoubleList[i] = 0;  // stores for how many atoms in startstep this atom is a target in endstep
-
   atom *Walker = mol->start;
   while (Walker->next != mol->end) {
@@ -347 +342 @@
   double Potential, OldPotential, OlderPotential;
   struct EvaluatePotential Params;
-  Params.PermutationMap = Malloc<atom*>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.**PermutationMap");
+  Params.PermutationMap = Calloc<atom*>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.**PermutationMap");
   Params.DistanceList = Malloc<DistanceMap*>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.**DistanceList");
   Params.DistanceIterators = Malloc<DistanceMap::iterator>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.*DistanceIterators");
-  Params.DoubleList = Malloc<int>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.*DoubleList");
+  Params.DoubleList = Calloc<int>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.*DoubleList");
   Params.StepList = Malloc<DistanceMap::iterator>(AtomCount, "molecule::MinimiseConstrainedPotential: Params.*StepList");
   int round;