Changes in src/World.cpp [24a5e0:028c2e]

File:

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

src/World.cpp

@@ -12 +12 @@
 #include "periodentafel.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
-#include "Descriptors/AtomDescriptor_impl.hpp"
-#include "Actions/ManipulateAtomsProcess.hpp"
 
 using namespace std;
@@ -30 +28 @@
 }
 
-vector<atom*> World::getAllAtoms(){
-  return getAllAtoms(AllAtoms());
-}
-
 int World::numAtoms(){
   return atoms.size();
@@ -42 +36 @@
 }
 
-/******************** Methods to change World state *********************/
-
 molecule* World::createMolecule(){
   OBSERVE;
   molecule *mol = NULL;
-  mol = NewMolecule();
-  assert(!molecules.count(currMoleculeId));
-  mol->setId(currMoleculeId++);
-  // store the molecule by ID
-  molecules[mol->getId()] = mol;
+  mol = new molecule(periode);
+  molecules_deprecated->insert(mol);
+  molecules.insert(mol);
   mol->signOn(this);
   return mol;
 }
 
-void World::destroyMolecule(molecule* mol){
-  OBSERVE;
-  destroyMolecule(mol->getId());
-}
-
-void World::destroyMolecule(moleculeId_t id){
-  OBSERVE;
-  molecule *mol = molecules[id];
-  assert(mol);
-  DeleteMolecule(mol);
-  molecules.erase(id);
-}
-
-
-atom *World::createAtom(){
-  OBSERVE;
-  atom *res = NewAtom();
-  assert(!atoms.count(currAtomId));
-  res->setId(currAtomId++);
-  res->setWorld(this);
-  // store the atom by ID
-  atoms[res->getId()] = res;
-  return res;
-}
-
-int World::registerAtom(atom *atom){
-  OBSERVE;
-  assert(!atoms.count(currAtomId));
-  atom->setId(currAtomId++);
-  atom->setWorld(this);
-  atoms[atom->getId()] = atom;
-  return atom->getId();
-}
-
-void World::destroyAtom(atom* atom){
-  OBSERVE;
-  int id = atom->getId();
-  destroyAtom(id);
-}
-
-void World::destroyAtom(atomId_t id) {
-  OBSERVE;
-  atom *atom = atoms[id];
-  assert(atom);
-  DeleteAtom(atom);
-  atoms.erase(id);
-}
-
-ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name,AtomDescriptor descr){
-  return new ManipulateAtomsProcess(op, descr,name,true);
-}
-
-ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name){
-  return manipulateAtoms(op,name,AllAtoms());
-}
-
-/********************* Internal Change methods for double Callback and Observer mechanism ********/
-
-void World::doManipulate(ManipulateAtomsProcess *proc){
-  proc->signOn(this);
-  {
-    OBSERVE;
-    proc->doManipulate(this);
-  }
-  proc->signOff(this);
-}
-
-/******************************* Iterators ********************************/
-
-/*
- * Actual Implementation of the iterators can be found in WorldIterators.cpp
- */
-
-World::AtomIterator World::getAtomIter(AtomDescriptor descr){
-  return AtomIterator(descr,this);
-}
-
-World::AtomSet::iterator World::atomEnd(){
-  return atoms.end();
-}
 
 /******************************* Singleton Stuff **************************/
@@ -143 +53 @@
 boost::mutex World::worldLock;
 
+
+
 World::World() :
     periode(new periodentafel),
-    atoms(),
-    currAtomId(0),
-    molecules(),
-    currMoleculeId(0),
-    molecules_deprecated(new MoleculeListClass(this))
+    molecules_deprecated(new MoleculeListClass),
+    dummyId(0)
 {
   molecules_deprecated->signOn(this);
@@ -156 +65 @@
 World::~World()
 {
+  molecules_deprecated->signOff(this);
   delete molecules_deprecated;
   delete periode;
-  MoleculeSet::iterator molIter;
-  for(molIter=molecules.begin();molIter!=molecules.end();++molIter){
-    DeleteMolecule((*molIter).second);
-  }
-  molecules.clear();
-  AtomSet::iterator atIter;
-  for(atIter=atoms.begin();atIter!=atoms.end();++atIter){
-    DeleteAtom((*atIter).second);
-  }
-  atoms.clear();
 }
 
@@ -180 +80 @@
 
 void World::destroy(){
+  // For legacy reasons all atoms have to be destroyed first, since unregistering would cause deadlocks otherwise
+  theWorld->destroyLegacy();
+  //WARNING: at this point we have a small race condition, when sombody now tries to access the world.
+
   // boost supports RAII-Style locking, so we don't need to unlock
   boost::mutex::scoped_lock guard(worldLock);
@@ -187 +91 @@
 
 World* World::reset(){
+  // For legacy reasons all atoms have to be destroyed first, since unregistering would cause deadlocks otherwise
+  theWorld->destroyLegacy();
+  //WARNING: at this point we have a small race condition, when sombody now tries to access the world.
+
   World* oldWorld = 0;
   {
@@ -206 +114 @@
   // should see that it gets the updated new world
   delete oldWorld;
-  return theWorld;
 }
 
@@ -214 +121 @@
   return molecules_deprecated;
 }
+
+// some legacy stuff to let the World know about items created outside
+void World::registerAtom(atom *theAtom){
+  OBSERVE;
+  atoms[dummyId++] = theAtom;
+}
+
+void World::destroyLegacy(){
+  //delete molecules_deprecated;
+}
+
+void World::unregisterAtom(atom *theAtom){
+  OBSERVE;
+  atoms.erase(theAtom->getId());
+}