Changes in src/Descriptors/MoleculeDescriptor.cpp [6d574a:8cce2b]

File:

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

src/Descriptors/MoleculeDescriptor.cpp

@@ -12 +12 @@
 
 #include "World.hpp"
+#include "Patterns/ObservedContainer_impl.hpp"
 
 #include "molecule.hpp"
@@ -20 +21 @@
 using namespace std;
 
-typedef World::MoleculeSet::iterator molecules_iter_t;
+typedef World::MoleculeSet::internal_iterator molecules_iter_t;
 
 /************************ Forwarding object **************************************/
@@ -73 +74 @@
 
 molecule* MoleculeDescriptor_impl::find() {
-  World::MoleculeSet molecules = getMolecules();
-  molecules_iter_t res = find_if(molecules.begin(),molecules.end(),boost::bind(&MoleculeDescriptor_impl::predicate,this,_1));
-  return (res!=molecules.end())?((*res).second):0;
+  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;
 }
 
 vector<molecule*> MoleculeDescriptor_impl::findAll() {
   vector<molecule*> res;
-  World::MoleculeSet molecules = getMolecules();
-  molecules_iter_t iter;
-  for(iter=molecules.begin();iter!=molecules.end();++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;
 }