Changes in src/World.hpp [d2dbac0:24a5e0]

File:

• src/World.hpp (modified) (6 diffs)

src/World.hpp

@@ -16 +16 @@
 #include <boost/shared_ptr.hpp>
 
-
+#include "defs.hpp"
 #include "Patterns/Observer.hpp"
 #include "Patterns/Cacheable.hpp"
@@ -40 +40 @@
 friend class ManipulateAtomsProcess;
 template<typename> friend class AtomsCalculation;
-
-typedef std::map<int,atom*> AtomSet;
-typedef std::map<int,molecule*> MoleculeSet;
 public:
+  typedef std::map<atomId_t,atom*> AtomSet;
+  typedef std::map<moleculeId_t,molecule*> MoleculeSet;
 
   /***** getter and setter *****/
@@ -90 +89 @@
   molecule *createMolecule();
 
+  void destroyMolecule(molecule*);
+  void destroyMolecule(moleculeId_t);
+
   /**
    * Create a new atom. This method should be used whenever any atom is needed. Assigns a unique ID and stores
@@ -112 +114 @@
    * atom directly since this will leave the pointer inside the world.
    */
-  void destroyAtom(int);
+  void destroyAtom(atomId_t);
 
   /**
@@ -140 +142 @@
   protected:
     void advanceState();
-    World* world;
     AtomSet::iterator state;
     boost::shared_ptr<AtomDescriptor_impl>  descr;
     int index;
+
+    World* world;
   };
 
@@ -166 +169 @@
   periodentafel *periode;
   AtomSet atoms;
-  int currAtomId; //!< stores the next available Id for atoms
+  atomId_t currAtomId; //!< stores the next available Id for atoms
   MoleculeSet molecules;
-  int currMoleculeId;
+  moleculeId_t currMoleculeId;