Changeset a5471c for molecuilder

Timestamp:

Feb 18, 2010, 1:21:35 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

cbc27f

Parents:

b53a7e

Message:

Added iterator structure that allows iterating over selected atoms in the World.

Location:

molecuilder/src

Files:

• Descriptors/AtomDescriptor.hpp (modified) (2 diffs)
• Descriptors/AtomDescriptor_impl.hpp (modified) (1 diff)
• Descriptors/AtomIdDescriptor_impl.hpp (modified) (1 diff)
• World.cpp (modified) (2 diffs)
• World.hpp (modified) (3 diffs)

molecuilder/src/Descriptors/AtomDescriptor.hpp

@@ -15 +15 @@
 #include "World.hpp"
 
+class World;
 class atom;
 
@@ -21 +22 @@
 
 class AtomDescriptor {
+  // close coupling to the world to allow access
   friend atom* World::getAtom(AtomDescriptor descriptor);
   friend std::vector<atom*> World::getAllAtoms(AtomDescriptor descriptor);
+  friend class World::AtomIterator;
 
   friend AtomDescriptor operator&&(const AtomDescriptor &lhs, const AtomDescriptor &rhs);

molecuilder/src/Descriptors/AtomDescriptor_impl.hpp

@@ -1 @@
-#include "Descriptors/AtomDescriptor.hpp"
-
 /************************ Declarations of implementation Objects ************************/
 

molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp

@@ -1 @@
-#include "Descriptors/AtomIdDescriptor.hpp"
 #include "Descriptors/AtomDescriptor_impl.hpp"
 

molecuilder/src/World.cpp

@@ -12 +12 @@
 #include "periodentafel.hpp"
 #include "Descriptors/AtomDescriptor.hpp"
+#include "Descriptors/AtomDescriptor_impl.hpp"
 
 using namespace std;
@@ -46 +47 @@
 }
 
+/******************************* Iterators ********************************/
+
+World::AtomIterator::AtomIterator(AtomDescriptor _descr, World* _world) :
+    descr(_descr.get_impl()),
+    world(_world)
+{
+  state = world->atoms.begin();
+  advanceState();
+}
+
+World::AtomIterator::AtomIterator(const AtomIterator& rhs) :
+    state(rhs.state),
+    descr(rhs.descr)
+  {}
+
+World::AtomIterator& World::AtomIterator::operator++(){
+  advanceState();
+}
+
+bool World::AtomIterator::operator==(const AtomIterator& rhs){
+  return state==rhs.state;
+}
+
+bool World::AtomIterator::operator!=(const AtomIterator& rhs){
+  return state!=rhs.state;
+}
+
+atom* World::AtomIterator::operator*(){
+  return (*state).second;
+}
+
+void World::AtomIterator::advanceState(){
+  while(state!=world->atoms.end() && !descr->predicate(*state))
+    state++;
+}
+
+World::AtomIterator World::getAtomIter(AtomDescriptor descr){
+  return AtomIterator(descr,this);
+}
 
 /******************************* Singleton Stuff **************************/

molecuilder/src/World.hpp

@@ -13 +13 @@
 #include <vector>
 #include <set>
+#include <boost/shared_ptr.hpp>
 
 #include "Patterns/Observer.hpp"
@@ -28 +29 @@
 {
 friend class AtomDescriptor_impl;
+friend class AtomDescriptor;
+
+typedef std::map<int,atom*> AtomList;
 public:
 
@@ -40 +44 @@
   /***** Methods to work with the World *****/
   molecule *createMolecule();
+
+protected:
+  /**** Iterators to use internal data structures */
+  class AtomIterator {
+  public:
+    AtomIterator(AtomDescriptor, World*);
+    AtomIterator(const AtomIterator&);
+    AtomIterator& operator++();
+    bool operator==(const AtomIterator&);
+    bool operator!=(const AtomIterator&);
+    atom* operator*();
+  protected:
+    void advanceState();
+    World* world;
+    AtomList::iterator state;
+    boost::shared_ptr<AtomDescriptor_impl>  descr;
+  };
+
+  AtomIterator getAtomIter(AtomDescriptor descr);
+
 private:
   periodentafel *periode;
-  std::map<int,atom*> atoms;
+  AtomList atoms;
   std::set<molecule*> molecules;