Changes in src/molecule.hpp [c27778:f17e1c]

File:

• src/molecule.hpp (modified) (8 diffs)

src/molecule.hpp

@@ -7 +7 @@
 #define MOLECULES_HPP_
 
-using namespace std;
-
 /*********************************************** includes ***********************************/
 
-// GSL headers
-#include <gsl/gsl_eigen.h>
-#include <gsl/gsl_heapsort.h>
-#include <gsl/gsl_linalg.h>
-#include <gsl/gsl_matrix.h>
-#include <gsl/gsl_multimin.h>
-#include <gsl/gsl_vector.h>
-#include <gsl/gsl_randist.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 //// STL headers
@@ -31 +24 @@
 #include "types.hpp"
 #include "graph.hpp"
-#include "stackclass.hpp"
 #include "tesselation.hpp"
 #include "Patterns/Observer.hpp"
 #include "Patterns/ObservedIterator.hpp"
 #include "Patterns/Cacheable.hpp"
+#include "Formula.hpp"
 
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
@@ -53 +46 @@
 class periodentafel;
 class Vector;
+class Shape;
+template <class> class StackClass;
 
 /******************************** Some definitions for easier reading **********************************/
@@ -103 +98 @@
     //int AtomCount;          //!< number of atoms, brought up-to-date by CountAtoms()
     int BondCount;          //!< number of atoms, brought up-to-date by CountBonds()
-    int ElementCount;       //!< how many unique elements are therein
-    int ElementsInMolecule[MAX_ELEMENTS]; //!< list whether element (sorted by atomic number) is alread present or not
     mutable int NoNonHydrogen;  //!< number of non-hydrogen atoms in molecule
     mutable int NoNonBonds;     //!< number of non-hydrogen bonds in molecule
@@ -115 +108 @@
 
   private:
-    Cacheable<string> formula;
+    Formula formula;
     Cacheable<int>    AtomCount;
     moleculeId_t id;
@@ -141 +134 @@
   void setId(moleculeId_t);
   void setName(const std::string);
-  const std::string getFormula();
-  std::string calcFormula();
+  const Formula &getFormula();
+  unsigned int getElementCount();
+  bool hasElement(const element*) const;
+  bool hasElement(atomicNumber_t) const;
+  bool hasElement(const std::string&) const;
+
 
   iterator begin();
@@ -260 +257 @@
 
   /// Count and change present atoms' coordination.
-  void CountElements();
   bool CenterInBox();
   bool BoundInBox();
@@ -316 +312 @@
 
   molecule *CopyMolecule();
-  molecule* CopyMoleculeFromSubRegion(const Vector offset, const double *parallelepiped) const;
+  molecule* CopyMoleculeFromSubRegion(const Shape&) const;
 
   /// Fragment molecule by two different approaches: