Changes in src/World.cpp [35b698:6d574a]

File:

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

src/World.cpp

@@ -14 +14 @@
 #include "molecule.hpp"
 #include "periodentafel.hpp"
-#include "ThermoStatContainer.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
 #include "Descriptors/AtomDescriptor_impl.hpp"
@@ -21 +20 @@
 #include "Descriptors/SelectiveIterator_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
+#include "Helpers/Assert.hpp"
 
 #include "Patterns/Singleton_impl.hpp"
@@ -91 +91 @@
 };
 
-class ThermoStatContainer * World::getThermostats()
-{
-  return Thermostats;
-}
-
-
 int World::getExitFlag() {
   return ExitFlag;
@@ -112 +106 @@
   molecule *mol = NULL;
   mol = NewMolecule();
-  cout << "Creating molecule with id " << currMoleculeId << "." << endl;
-  assert(!molecules.count(currMoleculeId));
+  ASSERT(!molecules.count(currMoleculeId),"currMoleculeId did not specify an unused ID");
   mol->setId(currMoleculeId++);
   // store the molecule by ID
@@ -129 +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);
@@ -165 +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);
@@ -177 +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);
   }
@@ -289 +282 @@
     periode(new periodentafel),
     configuration(new config),
-    Thermostats(new ThermoStatContainer),
     ExitFlag(0),
     atoms(),
@@ -315 +307 @@
   delete periode;
   delete configuration;
-  delete Thermostats;
   MoleculeSet::iterator molIter;
   for(molIter=molecules.begin();molIter!=molecules.end();++molIter){