Changes in src/Descriptors/AtomIdDescriptor.cpp [7a1ce5:24a5e0]

File:

• src/Descriptors/AtomIdDescriptor.cpp (modified) (2 diffs)

src/Descriptors/AtomIdDescriptor.cpp

@@ -14 +14 @@
 
 
-AtomIdDescriptor_impl::AtomIdDescriptor_impl(int _id) :
+AtomIdDescriptor_impl::AtomIdDescriptor_impl(atomId_t _id) :
   id(_id)
 {}
@@ -21 +21 @@
 {}
 
-bool AtomIdDescriptor_impl::predicate(std::pair<int,atom*> atom) {
-  return atom.second->getId()==id;
+bool AtomIdDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom) {
+  return atom.first==id;
 }
 
-AtomDescriptor AtomById(int id){
+AtomDescriptor AtomById(atomId_t id){
   return AtomDescriptor(AtomDescriptor::impl_ptr(new AtomIdDescriptor_impl(id)));
 }
 
-#if 0
-
-// so far the lookuptable for Atoms-by-id does not work, since atoms don't get an ID upon creation.
-// instead of this we rely on walking through all atoms.
-
-atom *AtomIdDescriptor::find(){
-  map<int,atom*> atoms = getAtoms();
-  map<int,atom*>::iterator res = atoms.find(id);
+atom *AtomIdDescriptor_impl::find(){
+  World::AtomSet atoms = getAtoms();
+  World::AtomSet::iterator res = atoms.find(id);
   return (res!=atoms.end())?((*res).second):0;
 }
 
-vector<atom*> AtomIdDescriptor::findAll(){
+vector<atom*> AtomIdDescriptor_impl::findAll(){
   atom *res = find();
   return (res)?(vector<atom*>(1,res)):(vector<atom*>());
 }
-
-#endif