Changeset a1a532 for molecuilder/src/World.hpp

Timestamp:

Feb 25, 2010, 10:50:54 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

2e6496

Parents:

bb89b9

Message:

moved Iterators for the World to a seperate file

File:

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

molecuilder/src/World.hpp

@@ -41 +41 @@
 template<typename> friend class AtomsCalculation;
 
-typedef std::map<int,atom*> AtomList;
+typedef std::map<int,atom*> AtomSet;
+typedef std::map<int,molecule*> MoleculeSet;
 public:
 
@@ -131 +132 @@
     AtomIterator  operator++(int);  // postfix with dummy parameter
     bool operator==(const AtomIterator&);
-    bool operator==(const AtomList::iterator&);
+    bool operator==(const AtomSet::iterator&);
     bool operator!=(const AtomIterator&);
-    bool operator!=(const AtomList::iterator&);
+    bool operator!=(const AtomSet::iterator&);
     atom* operator*();
 
@@ -140 +141 @@
     void advanceState();
     World* world;
-    AtomList::iterator state;
+    AtomSet::iterator state;
     boost::shared_ptr<AtomDescriptor_impl>  descr;
     int index;
@@ -152 +153 @@
 
   /**
-   * returns an iterator to the end of the AtomList. Due to overloading this iterator
+   * returns an iterator to the end of the AtomSet. Due to overloading this iterator
    * can be compared to iterators produced by getAtomIter (see the mis-matching types).
    * Thus it can be used to detect when such an iterator is at the end of the list.
    * used for internal purposes, like AtomProcesses and AtomCalculations.
    */
-  AtomList::iterator atomEnd();
+  AtomSet::iterator atomEnd();
 
   /******* Internal manipulation routines for double callback and Observer mechanism ******/
@@ -164 +165 @@
 private:
   periodentafel *periode;
-  AtomList atoms;
+  AtomSet atoms;
   int currAtomId; //!< stores the next available Id for atoms
-  std::set<molecule*> molecules;
+  MoleculeSet molecules;
+  int currMoleculeId;