Changeset df0520 for molecuilder/src/molecule.hpp

Timestamp:

Nov 2, 2009, 12:50:57 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

8bc524

Parents:

245826

Message:

Small changes.

• VolumeOfConvexEnvelope() - setprecision corrected
• BUGFIX: PrepareClustersinWater() - IsAngstroem was set to NULL instead of true
• config::Load(), ..LoadOld() - get MoleculeListClass instead of molecule
• config::TestSyntax() - removed unncessary molecule parameter
• ParseCommandLineOptions() - no mol is created anymore, this is done when parsing in config::Load(), mol is set to first active instead
• config.cpp: Lots of ^{M (dos EOL) removed}
• have const molecule * const ref now: MoleculeLeafClass::FillBondStructureFromReference(), molecule::PickLocalBackEdges(), DepthFirstSearchAnalysis_CheckForaNewComponent(), DepthFirstSearchAnalysis_ProbeAlongUnusedBond()
• are const member functions now - necessary due to periodentafel being a const pointer: molecule::ResetAllBondsToUnused(), molecule::FindNextUnused(), molecule::SetNextComponentNumber(), molecule::CyclicStructureAnalysis(), CyclicStructureAnalysis_AssignRingSizetoNonCycleMembers(), molecule::OutputGraphInfoPerBond(), molecule::OutputGraphInfoPerAtom(), molecule::CyclicBondAnalysis(), molecule::CyclicStructureAnalysis(), molecule::GetColor(), molecule::CorrectBondDegree(), molecule::OutputBondsList()
• in molecule NoNonHydrogen, NoNonBonds and NoCyclicBonds are mutable
• molecule constructor rewritten with respect to ticket #4 (shorten constructors)

File:

• molecuilder/src/molecule.hpp (modified) (5 diffs)

molecuilder/src/molecule.hpp

@@ -83 +83 @@
   public:
     double cell_size[6];//!< cell size
-    periodentafel *elemente; //!< periodic table with each element
+    const periodentafel * const elemente; //!< periodic table with each element
     atom *start;        //!< start of atom list
     atom *end;          //!< end of atom list
@@ -93 +93 @@
     int ElementCount;       //!< how many unique elements are therein
     int ElementsInMolecule[MAX_ELEMENTS]; //!< list whether element (sorted by atomic number) is alread present or not
-    int NoNonHydrogen;  //!< number of non-hydrogen atoms in molecule
-    int NoNonBonds;     //!< number of non-hydrogen bonds in molecule
-    int NoCyclicBonds;  //!< number of cyclic bonds in molecule, by DepthFirstSearchAnalysis()
+    mutable int NoNonHydrogen;  //!< number of non-hydrogen atoms in molecule
+    mutable int NoNonBonds;     //!< number of non-hydrogen bonds in molecule
+    mutable int NoCyclicBonds;  //!< number of cyclic bonds in molecule, by DepthFirstSearchAnalysis()
     double BondDistance;  //!< typical bond distance used in CreateAdjacencyList() and furtheron
     bool ActiveFlag;    //!< in a MoleculeListClass used to discern active from inactive molecules
@@ -102 +102 @@
     int IndexNr;        //!< index of molecule in a MoleculeListClass
 
-  molecule(periodentafel *teil);
+  molecule(const periodentafel * const teil);
   virtual ~molecule();
 
@@ -241 +241 @@
   void CreateAdjacencyListFromDbondFile(ofstream *out, ifstream *output);
   void CreateAdjacencyList(ofstream *out, double bonddistance, bool IsAngstroem, void (BondGraph::*f)(BondedParticle * const , BondedParticle * const , double &, double &, bool), BondGraph *BG = NULL);
-  int CorrectBondDegree(ofstream *out);
-  void OutputBondsList(ofstream *out);
-  void CyclicBondAnalysis();
-  void OutputGraphInfoPerAtom(ofstream *out);
-  void OutputGraphInfoPerBond(ofstream *out);
+  int CorrectBondDegree(ofstream *out) const;
+  void OutputBondsList(ofstream *out) const;
+  void CyclicBondAnalysis() const;
+  void OutputGraphInfoPerAtom(ofstream *out) const;
+  void OutputGraphInfoPerBond(ofstream *out) const;
 
 
   // Graph analysis
-  MoleculeLeafClass * DepthFirstSearchAnalysis(ofstream *out, class StackClass<bond *> *&BackEdgeStack);
-  void CyclicStructureAnalysis(ofstream *out, class StackClass<bond *> *BackEdgeStack, int *&MinimumRingSize);
-  bool PickLocalBackEdges(ofstream *out, atom **ListOfLocalAtoms, class StackClass<bond *> *&ReferenceStack, class StackClass<bond *> *&LocalStack);
-  bond * FindNextUnused(atom *vertex);
-  void SetNextComponentNumber(atom *vertex, int nr);
-  void InitComponentNumbers();
-  void ResetAllBondsToUnused();
+  MoleculeLeafClass * DepthFirstSearchAnalysis(ofstream *out, class StackClass<bond *> *&BackEdgeStack) const;
+  void CyclicStructureAnalysis(ofstream *out, class StackClass<bond *> *BackEdgeStack, int *&MinimumRingSize) const;
+  bool PickLocalBackEdges(ofstream *out, atom **ListOfLocalAtoms, class StackClass<bond *> *&ReferenceStack, class StackClass<bond *> *&LocalStack) const;
+  bond * FindNextUnused(atom *vertex) const;
+  void SetNextComponentNumber(atom *vertex, int nr) const;
+  void ResetAllBondsToUnused() const;
   int CountCyclicBonds(ofstream *out);
   bool CheckForConnectedSubgraph(ofstream *out, KeySet *Fragment);
-  string GetColor(enum Shading color);
+  string GetColor(enum Shading color) const;
   bond * CopyBond(atom *left, atom *right, bond *CopyBond);
 
@@ -351 +350 @@
 
   bool AddLeaf(molecule *ptr, MoleculeLeafClass *Previous);
-  bool FillBondStructureFromReference(ofstream *out, molecule *reference, int &FragmentCounter, atom ***&ListOfLocalAtoms, bool FreeList = false);
+  bool FillBondStructureFromReference(ofstream *out, const molecule * const reference, int &FragmentCounter, atom ***&ListOfLocalAtoms, bool FreeList = false);
   bool FillRootStackForSubgraphs(ofstream *out, KeyStack *&RootStack, bool *AtomMask, int &FragmentCounter);
   bool AssignKeySetsToFragment(ofstream *out, molecule *reference, Graph *KeySetList, atom ***&ListOfLocalAtoms, Graph **&FragmentList, int &FragmentCounter, bool FreeList = false);