Changes in src/World.cpp [57f243:e472eab]

File:

• src/World.cpp (modified) (14 diffs)

src/World.cpp

@@ -25 +25 @@
 #include "Helpers/Assert.hpp"
 #include "Box.hpp"
-#include "LinearAlgebra/Matrix.hpp"
+#include "Matrix.hpp"
 #include "defs.hpp"
 
@@ -48 +48 @@
 }
 
-World::AtomComposite World::getAllAtoms(AtomDescriptor descriptor){
+vector<atom*> World::getAllAtoms(AtomDescriptor descriptor){
   return descriptor.findAll();
 }
 
-World::AtomComposite World::getAllAtoms(){
+vector<atom*> World::getAllAtoms(){
   return getAllAtoms(AllAtoms());
 }
@@ -234 +234 @@
     atomIdPool_t::iterator iter=atomIdPool.begin();
     atomId_t id = iter->first;
-    range<atomId_t> newRange = makeRange(id+1,iter->last);
+    pair<atomId_t,atomId_t> newRange = make_pair(id+1,iter->second);
     // we wont use this iterator anymore, so we don't care about invalidating
     atomIdPool.erase(iter);
-    if(newRange.first<newRange.last){
+    if(newRange.first<newRange.second){
       atomIdPool.insert(newRange);
     }
@@ -247 +247 @@
 
 void World::releaseAtomId(atomId_t id){
-  atomIdPool.insert(makeRange(id,id+1));
+  atomIdPool.insert(make_pair(id,id+1));
   defragAtomIdPool();
 }
@@ -253 +253 @@
 bool World::reserveAtomId(atomId_t id){
   if(id>=currAtomId ){
-    range<atomId_t> newRange = makeRange(currAtomId,id);
-    if(newRange.first<newRange.last){
+    pair<atomId_t,atomId_t> newRange = make_pair(currAtomId,id);
+    if(newRange.first<newRange.second){
       atomIdPool.insert(newRange);
     }
@@ -263 +263 @@
   // look for a range that matches the request
   for(atomIdPool_t::iterator iter=atomIdPool.begin();iter!=atomIdPool.end();++iter){
-    if(iter->isBefore(id)){
-      // we have covered all available ranges... nothing to be found here
+    if(iter->first>id){
+      // we have coverd all available ranges... nothing to be found here
       break;
     }
     // no need to check first, since it has to be <=id, since otherwise we would have broken out
-    if(!iter->isBeyond(id)){
+    if(iter->second > id){
       // we found a matching range... get the id from this range
 
       // split up this range at the point of id
-      range<atomId_t> bottomRange = makeRange(iter->first,id);
-      range<atomId_t> topRange = makeRange(id+1,iter->last);
+      pair<atomId_t,atomId_t> bottomRange = make_pair(iter->first,id);
+      pair<atomId_t,atomId_t> topRange = make_pair(id+1,iter->second);
       // remove this range
       atomIdPool.erase(iter);
-      if(bottomRange.first<bottomRange.last){
+      if(bottomRange.first<bottomRange.second){
         atomIdPool.insert(bottomRange);
       }
-      if(topRange.first<topRange.last){
+      if(topRange.first<topRange.second){
         atomIdPool.insert(topRange);
       }
@@ -301 +301 @@
     atomIdPool_t::iterator next = iter;
     next++;
-    if(next!=atomIdPool.end() && (next->first==iter->last)){
+    if(next!=atomIdPool.end() && (next->first==iter->second)){
       // merge the two ranges
-      range<atomId_t> newRange = makeRange(iter->first,next->last);
+      pair<atomId_t,atomId_t> newRange = make_pair(iter->first,next->second);
       atomIdPool.erase(iter);
       atomIdPool.erase(next);
@@ -317 +317 @@
     atomIdPool_t::iterator iter = atomIdPool.end();
     iter--;
-    if(iter->last==currAtomId){
+    if(iter->second==currAtomId){
       currAtomId=iter->first;
       atomIdPool.erase(iter);
@@ -333 +333 @@
     moleculeIdPool_t::iterator iter=moleculeIdPool.begin();
     moleculeId_t id = iter->first;
-    range<moleculeId_t> newRange = makeRange(id+1,iter->last);
+    pair<moleculeId_t,moleculeId_t> newRange = make_pair(id+1,iter->second);
     // we wont use this iterator anymore, so we don't care about invalidating
     moleculeIdPool.erase(iter);
-    if(newRange.first<newRange.last){
+    if(newRange.first<newRange.second){
       moleculeIdPool.insert(newRange);
     }
@@ -346 +346 @@
 
 void World::releaseMoleculeId(moleculeId_t id){
-  moleculeIdPool.insert(makeRange(id,id+1));
+  moleculeIdPool.insert(make_pair(id,id+1));
   defragMoleculeIdPool();
 }
@@ -352 +352 @@
 bool World::reserveMoleculeId(moleculeId_t id){
   if(id>=currMoleculeId ){
-    range<moleculeId_t> newRange = makeRange(currMoleculeId,id);
-    if(newRange.first<newRange.last){
+    pair<moleculeId_t,moleculeId_t> newRange = make_pair(currMoleculeId,id);
+    if(newRange.first<newRange.second){
       moleculeIdPool.insert(newRange);
     }
@@ -362 +362 @@
   // look for a range that matches the request
   for(moleculeIdPool_t::iterator iter=moleculeIdPool.begin();iter!=moleculeIdPool.end();++iter){
-    if(iter->isBefore(id)){
+    if(iter->first>id){
       // we have coverd all available ranges... nothing to be found here
       break;
     }
     // no need to check first, since it has to be <=id, since otherwise we would have broken out
-    if(!iter->isBeyond(id)){
+    if(iter->second > id){
       // we found a matching range... get the id from this range
 
       // split up this range at the point of id
-      range<moleculeId_t> bottomRange = makeRange(iter->first,id);
-      range<moleculeId_t> topRange = makeRange(id+1,iter->last);
+      pair<moleculeId_t,moleculeId_t> bottomRange = make_pair(iter->first,id);
+      pair<moleculeId_t,moleculeId_t> topRange = make_pair(id+1,iter->second);
       // remove this range
       moleculeIdPool.erase(iter);
-      if(bottomRange.first<bottomRange.last){
+      if(bottomRange.first<bottomRange.second){
         moleculeIdPool.insert(bottomRange);
       }
-      if(topRange.first<topRange.last){
+      if(topRange.first<topRange.second){
         moleculeIdPool.insert(topRange);
       }
@@ -400 +400 @@
     moleculeIdPool_t::iterator next = iter;
     next++;
-    if(next!=moleculeIdPool.end() && (next->first==iter->last)){
+    if(next!=moleculeIdPool.end() && (next->first==iter->second)){
       // merge the two ranges
-      range<moleculeId_t> newRange = makeRange(iter->first,next->last);
+      pair<moleculeId_t,moleculeId_t> newRange = make_pair(iter->first,next->second);
       moleculeIdPool.erase(iter);
       moleculeIdPool.erase(next);
@@ -416 +416 @@
     moleculeIdPool_t::iterator iter = moleculeIdPool.end();
     iter--;
-    if(iter->last==currMoleculeId){
+    if(iter->second==currMoleculeId){
       currMoleculeId=iter->first;
       moleculeIdPool.erase(iter);