Changes in src/World.hpp [e472eab:4d72e4]

File:

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

src/World.hpp

@@ -24 +24 @@
 #include "Patterns/Singleton.hpp"
 #include "Patterns/ObservedContainer.hpp"
+#include "Helpers/Range.hpp"
+#include "AtomSet.hpp"
 
 // include config.h
@@ -75 +77 @@
   typedef ObservedContainer<std::map<moleculeId_t,molecule*> > MoleculeSet;
 
+  typedef ATOMSET(std::vector) AtomComposite;
+
   /***** getter and setter *****/
   // reference to pointer is used for legacy reason... reference will be removed latter to keep encapsulation of World object
@@ -96 +100 @@
    * returns a vector containing all atoms that match a given descriptor
    */
-  std::vector<atom*> getAllAtoms(AtomDescriptor descriptor);
-  std::vector<atom*> getAllAtoms();
+  AtomComposite getAllAtoms(AtomDescriptor descriptor);
+  AtomComposite getAllAtoms();
 
   /**
@@ -360 +364 @@
   AtomSet atoms;
   AtomSet selectedAtoms;
-  typedef std::set<std::pair<atomId_t, atomId_t> > atomIdPool_t;
+  typedef std::set<range<atomId_t> > atomIdPool_t;
   /**
    * stores the pool for all available AtomIds below currAtomId
@@ -373 +377 @@
   MoleculeSet molecules;
   MoleculeSet selectedMolecules;
-  typedef std::set<std::pair<moleculeId_t, moleculeId_t> > moleculeIdPool_t;
+  typedef std::set<range<atomId_t> > moleculeIdPool_t;
   /**
    * stores the pool for all available AtomIds below currAtomId