Changes in src/World.hpp [23b547:88d586]

File:

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

src/World.hpp

@@ -19 +19 @@
 #include "Patterns/Observer.hpp"
 #include "Patterns/Cacheable.hpp"
-#include "Patterns/Singleton.hpp"
-
 
 // forward declarations
@@ -35 +33 @@
 class AtomsCalculation;
 
-
-
-class World : public Singleton<World>, public Observable
+class World : public Observable
 {
-
-// Make access to constructor and destructor possible from inside the singleton
-friend class Singleton<World>;
-
 // necessary for coupling with descriptors
 friend class AtomDescriptor_impl;
@@ -53 +45 @@
 template<typename> friend class AtomsCalculation;
 public:
-
-  // Types for Atom and Molecule structures
   typedef std::map<atomId_t,atom*> AtomSet;
   typedef std::map<moleculeId_t,molecule*> MoleculeSet;
@@ -161 +151 @@
   // Atoms
 
-  class AtomIterator :
-    public std::iterator<std::iterator_traits<AtomSet::iterator>::difference_type,
-                         std::iterator_traits<AtomSet::iterator>::value_type,
-                         std::iterator_traits<AtomSet::iterator>::pointer,
-                         std::iterator_traits<AtomSet::iterator>::reference>
-  {
+  class AtomIterator {
   public:
-
-    typedef AtomSet::iterator _Iter;
-    typedef _Iter::value_type value_type;
-    typedef _Iter::difference_type difference_type;
-    typedef _Iter::pointer pointer;
-    typedef _Iter::reference reference;
-    typedef _Iter::iterator_category iterator_category;
-
-
     AtomIterator();
     AtomIterator(AtomDescriptor, World*);
@@ -215 +191 @@
   // Molecules
 
-  class MoleculeIterator :
-    public std::iterator<std::iterator_traits<MoleculeSet::iterator>::difference_type,
-                         std::iterator_traits<MoleculeSet::iterator>::value_type,
-                         std::iterator_traits<MoleculeSet::iterator>::pointer,
-                         std::iterator_traits<MoleculeSet::iterator>::reference>
-  {
+  class MoleculeIterator {
   public:
-
-    typedef MoleculeSet::iterator _Iter;
-    typedef _Iter::value_type value_type;
-    typedef _Iter::difference_type difference_type;
-    typedef _Iter::pointer pointer;
-    typedef _Iter::reference reference;
-    typedef _Iter::iterator_category iterator_category;
-
     MoleculeIterator();
     MoleculeIterator(MoleculeDescriptor, World*);
@@ -282 +245 @@
   MoleculeSet molecules;
   moleculeId_t currMoleculeId;
+
+
+  /***** singleton Stuff *****/
+public:
+
+  /**
+   * get the currently active instance of the World.
+   */
+  static World* get();
+
+  /**
+   * destroy the currently active instance of the World.
+   */
+  static void destroy();
+
+  /**
+   * destroy the currently active instance of the World and immidiately
+   * create a new one. Use this to reset while somebody is still Observing
+   * the world and should reset the observed instance. All observers will be
+   * sent the subjectKille() message from the old world.
+   */
+  static World* reset();
+
 private:
   /**
@@ -294 +280 @@
    */
   virtual ~World();
+
+  static World *theWorld;
+  // this mutex only saves the singleton pattern...
+  // use other mutexes to protect internal data as well
+  // this mutex handles access to the pointer, not to the object!!!
+  static boost::mutex worldLock;
 
   /*****