Changes in src/World.cpp [387b36:6d574a]

File:

• src/World.cpp (modified) (7 diffs)

src/World.cpp

@@ -5 +5 @@
  *      Author: crueger
  */
+
+#include "Helpers/MemDebug.hpp"
 
 #include "World.hpp"
@@ -18 +20 @@
 #include "Descriptors/SelectiveIterator_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
+#include "Helpers/Assert.hpp"
 
 #include "Patterns/Singleton_impl.hpp"
@@ -103 +106 @@
   molecule *mol = NULL;
   mol = NewMolecule();
-  assert(!molecules.count(currMoleculeId));
+  ASSERT(!molecules.count(currMoleculeId),"currMoleculeId did not specify an unused ID");
   mol->setId(currMoleculeId++);
   // store the molecule by ID
@@ -119 +122 @@
   OBSERVE;
   molecule *mol = molecules[id];
-  assert(mol);
+  ASSERT(mol,"Molecule id that was meant to be destroyed did not exist");
   DeleteMolecule(mol);
   molecules.erase(id);
@@ -155 +158 @@
   OBSERVE;
   atom *atom = atoms[id];
-  assert(atom);
+  ASSERT(atom,"Atom ID that was meant to be destroyed did not exist");
   DeleteAtom(atom);
   atoms.erase(id);
@@ -167 +170 @@
   if(!target){
     target = atoms[oldId];
-    assert(target && "Atom with that ID not found");
+    ASSERT(target,"Atom with that ID not found");
     return target->changeId(newId);
   }
@@ -276 +279 @@
 
 World::World() :
+    Observable("World"),
     periode(new periodentafel),
     configuration(new config),