Changes in src/World.hpp [6e97e5:31af19]

File:

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

src/World.hpp

@@ -16 +16 @@
 #include <boost/shared_ptr.hpp>
 
-#include "types.hpp"
-#include "Descriptors/SelectiveIterator.hpp"
+#include "defs.hpp"
 #include "Patterns/Observer.hpp"
 #include "Patterns/Cacheable.hpp"
-#include "Patterns/Singleton.hpp"
-
 
 // forward declarations
@@ -36 +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;
@@ -54 +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 +150 @@
 
   // Atoms
-  typedef SelectiveIterator<atom*,AtomSet,AtomDescriptor> AtomIterator;
+
+  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>
+  {
+  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*);
+    AtomIterator(const AtomIterator&);
+    AtomIterator& operator=(const AtomIterator&);
+    AtomIterator& operator++();     // prefix
+    AtomIterator  operator++(int);  // postfix with dummy parameter
+    bool operator==(const AtomIterator&);
+    bool operator==(const AtomSet::iterator&);
+    bool operator!=(const AtomIterator&);
+    bool operator!=(const AtomSet::iterator&);
+    atom* operator*();
+
+    int getCount();
+  protected:
+    void advanceState();
+    AtomSet::iterator state;
+    boost::shared_ptr<AtomDescriptor_impl>  descr;
+    int index;
+
+    World* world;
+  };
 
   /**
@@ -175 +201 @@
    * used for internal purposes, like AtomProcesses and AtomCalculations.
    */
-  AtomIterator atomEnd();
+  AtomSet::iterator atomEnd();
 
   // Molecules
 
-  typedef SelectiveIterator<molecule*,MoleculeSet,MoleculeDescriptor> MoleculeIterator;
+  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>
+  {
+  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*);
+    MoleculeIterator(const MoleculeIterator&);
+    MoleculeIterator& operator=(const MoleculeIterator&);
+    MoleculeIterator& operator++();     // prefix
+    MoleculeIterator  operator++(int);  // postfix with dummy parameter
+    bool operator==(const MoleculeIterator&);
+    bool operator==(const MoleculeSet::iterator&);
+    bool operator!=(const MoleculeIterator&);
+    bool operator!=(const MoleculeSet::iterator&);
+    molecule* operator*();
+
+    int getCount();
+  protected:
+    void advanceState();
+    MoleculeSet::iterator state;
+    boost::shared_ptr<MoleculeDescriptor_impl>  descr;
+    int index;
+
+    World* world;
+  };
 
   /**
@@ -193 +254 @@
    * used for internal purposes, like MoleculeProcesses and MoleculeCalculations.
    */
-  MoleculeIterator moleculeEnd();
+  MoleculeSet::iterator moleculeEnd();
 
 
@@ -206 +267 @@
 
   periodentafel *periode;
-public:
   AtomSet atoms;
-private:
   std::set<atomId_t> atomIdPool; //<!stores the pool for all available AtomIds below currAtomId
   atomId_t currAtomId; //!< stores the next available Id for atoms
   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:
   /**
@@ -225 +307 @@
    */
   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;
 
   /*****