Changeset d34341 for molecuilder/src/molecule.hpp

Timestamp:

Jan 27, 2010, 2:36:09 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

dbd19f

Parents:

41182a (diff), 478683 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'heber/Analysis_PairCorrelation' into MenuRefactoring

Conflicts:

molecuilder/src/unittests/Makefile.am

File:

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

molecuilder/src/molecule.hpp

@@ -110 +110 @@
   TesselPoint *GetPoint() const ;
   TesselPoint *GetTerminalPoint() const ;
+  int GetMaxId() const;
   void GoToNext() const ;
   void GoToPrevious() const ;
@@ -325 +326 @@
   void Enumerate(ofstream *out);
   void Output(ofstream *out);
-  void DissectMoleculeIntoConnectedSubgraphs(molecule * const mol, config * const configuration);
+  void DissectMoleculeIntoConnectedSubgraphs(const periodentafel * const periode, config * const configuration);
   int CountAllAtoms() const;