Changes in src/periodentafel.hpp [ead4e6:4eb4fe]

File:

• src/periodentafel.hpp (modified) (4 diffs)

src/periodentafel.hpp

@@ -13 +13 @@
 #include <iterator>
 
+#include "unittests/periodentafelTest.hpp"
 #include "defs.hpp"
 #include "types.hpp"
@@ -27 +28 @@
 class periodentafel {
   /******* Types *********/
+  friend class periodentafelTest;
   private:
     typedef std::map<atomicNumber_t,element*> elementSet;
@@ -43 +45 @@
   iterator AddElement(element * const pointer);
   void RemoveElement(element * const pointer);
+  void RemoveElement(atomicNumber_t);
   void CleanupPeriodtable();
-  const element *FindElement(atomicNumber_t) const;
-  const element *FindElement(const char * const shorthand) const;
-  const element *AskElement() const;
-  const element *EnterElement();
+  element * const FindElement(atomicNumber_t) const;
+  element * const FindElement(const char * const shorthand) const;
+  element * const AskElement() const;
+  element * const EnterElement();
 
   const_iterator begin();
@@ -59 +62 @@
 
   private:
+
+  bool LoadElementsDatabase(std::istream *input);
+  bool LoadValenceDatabase(std::istream *input);
+  bool LoadOrbitalsDatabase(std::istream *input);
+  bool LoadHBondAngleDatabase(std::istream *input);
+  bool LoadHBondLengthsDatabase(std::istream *input);
+
     elementSet elements;
 };