Changes in src/Descriptors/MoleculeDescriptor.cpp [51be2a:8cce2b]

File:

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

src/Descriptors/MoleculeDescriptor.cpp

@@ -74 +74 @@
 
 molecule* MoleculeDescriptor_impl::find() {
-  World::MoleculeSet molecules = getMolecules();
+  World::MoleculeSet &molecules = getMolecules();
   molecules_iter_t res = find_if(molecules.begin_internal(),molecules.end_internal(),boost::bind(&MoleculeDescriptor_impl::predicate,this,_1));
   return (res!=molecules.end_internal())?((*res).second):0;
@@ -81 +81 @@
 vector<molecule*> MoleculeDescriptor_impl::findAll() {
   vector<molecule*> res;
-  World::MoleculeSet molecules = getMolecules();
-  molecules_iter_t iter;
-  for(iter=molecules.begin_internal();iter!=molecules.end_internal();++iter) {
-    if(predicate(*iter)){
-      res.push_back((*iter).second);
-    }
+  World::MoleculeSet &molecules = getMolecules();
+  for_each(molecules.begin_internal(),
+           molecules.end_internal(),
+           boost::bind(&MoleculeDescriptor_impl::checkAndAdd,
+                       this,&res,_1));
+  return res;
+}
+
+void MoleculeDescriptor_impl::checkAndAdd(std::vector<molecule*> *v,std::pair<moleculeId_t,molecule*> p){
+  if(predicate(p)){
+    v->push_back(p.second);
   }
-  return res;
 }