Changeset 245826 for molecuilder/src/config.hpp

Timestamp:

Oct 30, 2009, 4:09:29 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

df0520

Parents:

b84ab4

Message:

BondGraph is initialized within config::Load(), as it has to happen after parsing options and before loading molecule. And various fixes.

• FIX: BondGraph::LoadBondLengthTable() - scans into TempContainer, which is later given over to BondLengthMatrix or NULL'd if parsing failed.
• BondGraph::ConstructBondGraph() adapted to above, uses both bonds functions depending on present BondLengthMatrix.
• FIX: BondGraph::GetBondLength() - checks whether BondLengthMatrix is NULL.
• config::Load() and ..LoadOld() get additionally the BondLengthFilename and allocates and parses BondGraph.
• builder.cpp ParseCommandLineOptions() has been adapted to above changes.
• FIX: molecule::CreateAdjacencyList() checks whether bonddistance is > 1. (otherwise quite useless and yielding too many cells).

File:

• molecuilder/src/config.hpp (modified) (1 diff)

molecuilder/src/config.hpp

@@ -135 +135 @@
 
   int TestSyntax(const char * const filename, const periodentafel * const periode, const molecule * const mol) const;
-  void Load(const char * const filename, const periodentafel * const periode, molecule * const &mol);
-  void LoadOld(const char * const filename, const periodentafel * const periode, molecule * const &mol);
+  void Load(const char * const filename, const string &BondGraphFileName, const periodentafel * const periode, molecule * const &mol);
+  void LoadOld(const char * const filename, const string &BondGraphFileName, const periodentafel * const periode, molecule * const &mol);
   void RetrieveConfigPathAndName(const string filename);
   bool Save(const char * const filename, const periodentafel * const periode, molecule * const mol) const;