Changeset 33bc66 for molecuilder/src/Descriptors/AtomDescriptor.cpp

Timestamp:

Feb 26, 2010, 11:47:16 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

98a2987

Parents:

3db67e

Message:

Changed the type of AtomIds and MoleculeIds to an opaque type

File:

• molecuilder/src/Descriptors/AtomDescriptor.cpp (modified) (3 diffs)

molecuilder/src/Descriptors/AtomDescriptor.cpp

@@ -19 +19 @@
 using namespace std;
 
-typedef map<int,atom*> atoms_t;
-typedef atoms_t::iterator atoms_iter_t;
+typedef World::AtomSet::iterator atoms_iter_t;
 
 /************************ Forwarding object **************************************/
@@ -68 +67 @@
 }
 
-atoms_t& AtomDescriptor_impl::getAtoms(){
+World::AtomSet& AtomDescriptor_impl::getAtoms(){
   return World::get()->atoms;
 }
 
 atom* AtomDescriptor_impl::find() {
-  atoms_t atoms = getAtoms();
+  World::AtomSet 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;
@@ -80 +79 @@
 vector<atom*> AtomDescriptor_impl::findAll() {
   vector<atom*> res;
-  atoms_t atoms = getAtoms();
+  World::AtomSet atoms = getAtoms();
   atoms_iter_t iter;
   for(iter=atoms.begin();iter!=atoms.end();++iter) {