Changes in src/World.cpp [57adc7:6e97e5]

File:

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

src/World.cpp

@@ -15 +15 @@
 #include "Descriptors/MoleculeDescriptor.hpp"
 #include "Descriptors/MoleculeDescriptor_impl.hpp"
+#include "Descriptors/SelectiveIterator_impl.hpp"
 #include "Actions/ManipulateAtomsProcess.hpp"
+
+#include "Patterns/Singleton_impl.hpp"
 
 using namespace std;
@@ -170 +173 @@
     atomId_t id = *(atomIdPool.begin());
     atomIdPool.erase(id);
+    return id;
   }
 }
@@ -206 +210 @@
 /******************************* Iterators ********************************/
 
-/*
- * Actual Implementation of the iterators can be found in WorldIterators.cpp
- */
+// Build the AtomIterator from template
+CONSTRUCT_SELECTIVE_ITERATOR(atom*,World::AtomSet,AtomDescriptor);
+
 
 World::AtomIterator World::getAtomIter(AtomDescriptor descr){
-  return AtomIterator(descr,this);
-}
-
-World::AtomSet::iterator World::atomEnd(){
-  return atoms.end();
-}
+  return AtomIterator(descr,atoms);
+}
+
+World::AtomIterator World::atomEnd(){
+  return AtomIterator(AllAtoms(),atoms,atoms.end());
+}
+
+// build the MoleculeIterator from template
+CONSTRUCT_SELECTIVE_ITERATOR(molecule*,World::MoleculeSet,MoleculeDescriptor);
 
 World::MoleculeIterator World::getMoleculeIter(MoleculeDescriptor descr){
-  return MoleculeIterator(descr,this);
-}
-
-World::MoleculeSet::iterator World::moleculeEnd(){
-  return molecules.end();
+  return MoleculeIterator(descr,molecules);
+}
+
+World::MoleculeIterator World::moleculeEnd(){
+  return MoleculeIterator(AllMolecules(),molecules,molecules.end());
 }
 
 /******************************* Singleton Stuff **************************/
-
-// TODO: Hide boost-thread using Autotools stuff when no threads are used
-World* World::theWorld = 0;
-boost::mutex World::worldLock;
 
 World::World() :
@@ -260 +263 @@
 }
 
-World* World::get(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  if(!theWorld) {
-    theWorld = new World();
-  }
-  return theWorld;
-}
-
-void World::destroy(){
-  // boost supports RAII-Style locking, so we don't need to unlock
-  boost::mutex::scoped_lock guard(worldLock);
-  delete theWorld;
-  theWorld = 0;
-}
-
-World* World::reset(){
-  World* oldWorld = 0;
-  {
-    // boost supports RAII-Style locking, so we don't need to unlock
-    boost::mutex::scoped_lock guard(worldLock);
-
-    oldWorld = theWorld;
-    theWorld = new World();
-    // oldworld does not need protection any more,
-    // since we should have the only reference
-
-    // worldLock handles access to the pointer,
-    // not to the object
-  } // scope-end releases the lock
-
-  // we have to let all the observers know that the
-  // oldWorld was destroyed. oldWorld calls subjectKilled
-  // upon destruction. Every Observer getting that signal
-  // should see that it gets the updated new world
-  delete oldWorld;
-  return theWorld;
-}
+// Explicit instantiation of the singleton mechanism at this point
+
+CONSTRUCT_SINGLETON(World)
 
 /******************************* deprecated Legacy Stuff ***********************/