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

File:

• src/Descriptors/AtomDescriptor.cpp (modified) (8 diffs)

src/Descriptors/AtomDescriptor.cpp

@@ -19 +19 @@
 using namespace std;
 
-typedef World::AtomSet::iterator atoms_iter_t;
+typedef map<int,atom*> atoms_t;
+typedef atoms_t::iterator atoms_iter_t;
 
 /************************ Forwarding object **************************************/
@@ -67 +68 @@
 }
 
-World::AtomSet& AtomDescriptor_impl::getAtoms(){
+atoms_t& AtomDescriptor_impl::getAtoms(){
   return World::get()->atoms;
 }
 
 atom* AtomDescriptor_impl::find() {
-  World::AtomSet atoms = getAtoms();
+  atoms_t atoms = getAtoms();
   atoms_iter_t res = find_if(atoms.begin(),atoms.end(),boost::bind(&AtomDescriptor_impl::predicate,this,_1));
   return (res!=atoms.end())?((*res).second):0;
@@ -79 +80 @@
 vector<atom*> AtomDescriptor_impl::findAll() {
   vector<atom*> res;
-  World::AtomSet atoms = getAtoms();
+  atoms_t atoms = getAtoms();
   atoms_iter_t iter;
   for(iter=atoms.begin();iter!=atoms.end();++iter) {
@@ -97 +98 @@
 {}
 
-bool AtomAllDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
+bool AtomAllDescriptor_impl::predicate(std::pair<int,atom*>){
   return true;
 }
@@ -111 +112 @@
 {}
 
-bool AtomNoneDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
+bool AtomNoneDescriptor_impl::predicate(std::pair<int,atom*>){
   return false;
 }
@@ -129 +130 @@
 {}
 
-bool AtomAndDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomAndDescriptor_impl::predicate(std::pair<int,atom*> atom){
   return lhs->predicate(atom) && rhs->predicate(atom);
 }
@@ -145 +146 @@
 }
 
-bool AtomOrDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomOrDescriptor_impl::predicate(std::pair<int,atom*> atom){
   return lhs->predicate(atom) || rhs->predicate(atom);
 }
@@ -165 +166 @@
 }
 
-bool AtomNotDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomNotDescriptor_impl::predicate(std::pair<int,atom*> atom){
  return !(arg->predicate(atom));
 }