Changeset 5d4edf for molecuilder/src/World.cpp

Timestamp:

Feb 19, 2010, 11:49:42 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

9ef76a

Parents:

cbc27f

git-author:

Tillmann Crueger <crueger@…> (02/19/10 11:31:39)

git-committer:

Tillmann Crueger <crueger@…> (02/19/10 11:49:42)

Message:

Added a class that allows constructing Processes that have a result

File:

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

molecuilder/src/World.cpp

@@ -13 +13 @@
 #include "Descriptors/AtomDescriptor.hpp"
 #include "Descriptors/AtomDescriptor_impl.hpp"
+#include "Actions/ManipulateAtomsProcess.hpp"
 
 using namespace std;
@@ -47 +48 @@
 }
 
+
+ManipulateAtomsProcess* World::manipulateAtoms(boost::function<void(atom*)> op,std::string name,AtomDescriptor descr){
+  return new ManipulateAtomsProcess(op, descr,name,true);
+}
+
 /******************************* Iterators ********************************/
+
+World::AtomIterator::AtomIterator(){
+  state = World::get()->atomEnd();
+}
 
 World::AtomIterator::AtomIterator(AtomDescriptor _descr, World* _world) :
     descr(_descr.get_impl()),
-    world(_world)
+    world(_world),
+    index(0)
 {
   state = world->atoms.begin();
@@ -59 +70 @@
 World::AtomIterator::AtomIterator(const AtomIterator& rhs) :
     state(rhs.state),
-    descr(rhs.descr)
+    descr(rhs.descr),
+    index(rhs.index),
+    world(rhs.world)
   {}
 
+World::AtomIterator& World::AtomIterator::operator=(const AtomIterator& rhs)
+{
+  if(&rhs!=this){
+    state=rhs.state;
+    descr=rhs.descr;
+    index=rhs.index;
+    world=rhs.world;
+  }
+  return *this;
+}
+
 World::AtomIterator& World::AtomIterator::operator++(){
+  ++state;
+  ++index;
   advanceState();
+  return *this;
+}
+
+World::AtomIterator World::AtomIterator::operator++(int){
+  AtomIterator res(*this);
+  ++(*this);
+  return res;
 }
 
@@ -70 +103 @@
 }
 
+bool World::AtomIterator::operator==(const World::AtomList::iterator& rhs){
+  return state==rhs;
+}
+
 bool World::AtomIterator::operator!=(const AtomIterator& rhs){
   return state!=rhs.state;
 }
 
+bool World::AtomIterator::operator!=(const World::AtomList::iterator& rhs){
+  return state!=rhs;
+}
+
 atom* World::AtomIterator::operator*(){
   return (*state).second;
@@ -79 +120 @@
 
 void World::AtomIterator::advanceState(){
-  while(state!=world->atoms.end() && !descr->predicate(*state))
-    state++;
+  while((state!=world->atoms.end()) && (!descr->predicate(*state))){
+    ++state;
+    ++index;
+  }
+}
+
+int World::AtomIterator::getCount(){
+  return index;
 }
 
 World::AtomIterator World::getAtomIter(AtomDescriptor descr){
   return AtomIterator(descr,this);
+}
+
+World::AtomList::iterator World::atomEnd(){
+  return atoms.end();
 }
 
@@ -98 +149 @@
     dummyId(0),
     periode(new periodentafel),
-    molecules_deprecated(new MoleculeListClass)
+    molecules_deprecated(new MoleculeListClass),
+    atoms()
 {
   molecules_deprecated->signOn(this);