Changeset a5471c for molecuilder/src/World.cpp

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.

File:

• molecuilder/src/World.cpp (modified) (2 diffs)

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 **************************/