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

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
@@ -77 +75 @@
   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
@@ -100 +96 @@
    * returns a vector containing all atoms that match a given descriptor
    */
-  AtomComposite getAllAtoms(AtomDescriptor descriptor);
-  AtomComposite getAllAtoms();
+  std::vector<atom*> getAllAtoms(AtomDescriptor descriptor);
+  std::vector<atom*> getAllAtoms();
 
   /**
@@ -364 +360 @@
   AtomSet atoms;
   AtomSet selectedAtoms;
-  typedef std::set<range<atomId_t> > atomIdPool_t;
+  typedef std::set<std::pair<atomId_t, atomId_t> > atomIdPool_t;
   /**
    * stores the pool for all available AtomIds below currAtomId
@@ -377 +373 @@
   MoleculeSet molecules;
   MoleculeSet selectedMolecules;
-  typedef std::set<range<atomId_t> > moleculeIdPool_t;
+  typedef std::set<std::pair<moleculeId_t, moleculeId_t> > moleculeIdPool_t;
   /**
    * stores the pool for all available AtomIds below currAtomId