Changeset 120f8b for molecuilder/src/World.hpp

Timestamp:

Feb 16, 2010, 5:26:59 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

b53a7e

Parents:

323177

Message:

Moved control of molecules and periode to World.

File:

• molecuilder/src/World.hpp (modified) (5 diffs)

molecuilder/src/World.hpp

@@ -12 +12 @@
 #include <map>
 #include <vector>
+#include <set>
 
 #include "Patterns/Observer.hpp"
@@ -20 +21 @@
 class MoleculeListClass;
 class atom;
+class molecule;
 class AtomDescriptor;
 class AtomDescriptor_impl;
@@ -29 +31 @@
 
   /***** getter and setter *****/
-  periodentafel* getPeriode();
+  // reference to pointer is used for legacy reason... reference will be removed latter to keep encapsulation of World object
+  periodentafel *&getPeriode();
   atom* getAtom(AtomDescriptor descriptor);
   std::vector<atom*> getAllAtoms(AtomDescriptor descriptor);
+  int numAtoms();
+  int numMolecules();
+
+  /***** Methods to work with the World *****/
+  molecule *createMolecule();
 private:
   periodentafel *periode;
   std::map<int,atom*> atoms;
+  std::set<molecule*> molecules;
 
 
@@ -57 +66 @@
    *****/
 public:
-  MoleculeListClass *getMolecules();
+  MoleculeListClass *&getMolecules();
 
   // functions used for the WorldContent template mechanism
@@ -63 +72 @@
   void unregisterAtom(atom *theAtom);
 private:
-  MoleculeListClass *molecules;
+  // this function cleans up anything that cannot be cleaned while the lock is active
+  // at a later point all these cleanups have to be moved to the World Class so the deadlock and
+  // race condition can both be avoided.
+  void destroyLegacy();
+
+  MoleculeListClass *molecules_deprecated;
 
   // this is needed to assign unique IDs to atoms... so far