Changeset 5d4edf for molecuilder/src/World.hpp

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.hpp (modified) (5 diffs)

molecuilder/src/World.hpp

@@ -9 +9 @@
 #define WORLD_HPP_
 
-#include <boost/thread.hpp>
+#include <string>
 #include <map>
 #include <vector>
 #include <set>
+#include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
+
 
 #include "Patterns/Observer.hpp"
@@ -25 +27 @@
 class AtomDescriptor;
 class AtomDescriptor_impl;
+class ManipulateAtomsProcess;
 
 class World : public Observable
@@ -30 +33 @@
 friend class AtomDescriptor_impl;
 friend class AtomDescriptor;
+
+friend class ManipulateAtomsProcess;
 
 typedef std::map<int,atom*> AtomList;
@@ -45 +50 @@
   molecule *createMolecule();
 
+  ManipulateAtomsProcess* manipulateAtoms(boost::function<void(atom*)>,std::string,AtomDescriptor);
+
 protected:
   /**** Iterators to use internal data structures */
   class AtomIterator {
   public:
+    AtomIterator();
     AtomIterator(AtomDescriptor, World*);
     AtomIterator(const AtomIterator&);
-    AtomIterator& operator++();
+    AtomIterator& operator=(const AtomIterator&);
+    AtomIterator& operator++();     // prefix
+    AtomIterator  operator++(int);  // postfix with dummy parameter
     bool operator==(const AtomIterator&);
+    bool operator==(const AtomList::iterator&);
     bool operator!=(const AtomIterator&);
+    bool operator!=(const AtomList::iterator&);
     atom* operator*();
+
+    int getCount();
   protected:
     void advanceState();
@@ -60 +74 @@
     AtomList::iterator state;
     boost::shared_ptr<AtomDescriptor_impl>  descr;
+    int index;
   };
 
   AtomIterator getAtomIter(AtomDescriptor descr);
+  AtomList::iterator atomEnd();
 
 private: