Changeset 795c0f for src/Descriptors/AtomDescriptor.cpp

Timestamp:

Jul 24, 2015, 4:44:34 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

63fb7a

Parents:

97445f

git-author:

Frederik Heber <heber@…> (06/01/15 08:30:56)

git-committer:

Frederik Heber <heber@…> (07/24/15 16:44:34)

Message:

World::getAtoms() now has const versions as well.

• this in turn required to adapt all AtomDescriptors and some fixes, e.g. predicate is now const member and works on const atom ptr.

File:

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

src/Descriptors/AtomDescriptor.cpp

@@ -49 +49 @@
 
 typedef World::AtomSet::internal_iterator atoms_iter_t;
+typedef World::AtomSet::const_iterator atoms_const_iter_t;
 
 /************************ Forwarding object **************************************/
@@ -75 +76 @@
 }
 
+const atom* AtomDescriptor::find() const {
+  return const_cast<const impl_t &>(*impl).find();
+}
+
 std::vector<atom*> AtomDescriptor::findAll(){
   return impl->findAll();
 }
 
+std::vector<const atom*> AtomDescriptor::findAll() const {
+  return const_cast<const impl_t &>(*impl).findAll();
+}
+
 AtomDescriptor::impl_ptr AtomDescriptor::get_impl() const{
   return impl;
@@ -98 +107 @@
 World::AtomSet& AtomDescriptor_impl::getAtoms(){
   return World::getInstance().atoms;
+}
+
+const World::AtomSet& AtomDescriptor_impl::getAtoms() const {
+  return const_cast<const World &>(World::getInstance()).atoms;
 }
 
@@ -104 +117 @@
   atoms_iter_t res = find_if(atoms.begin_internal(),atoms.end_internal(),boost::bind(&AtomDescriptor_impl::predicate,this,_1));
   return (res!=atoms.end_internal())?((*res).second):0;
+}
+
+const atom* AtomDescriptor_impl::find() const {
+  const World::AtomSet &atoms = getAtoms();
+  atoms_const_iter_t res = find_if(atoms.begin(),atoms.end(),boost::bind(&AtomDescriptor_impl::predicate,this,_1));
+  return (res!=atoms.end())?((*res).second):0;
 }
 
@@ -111 +130 @@
   for_each(atoms.begin_internal(),
            atoms.end_internal(),
-           boost::bind(&AtomDescriptor_impl::checkAndAdd,
-                       this,&res,_1));
+           boost::bind(static_cast<void (AtomDescriptor_impl::*)(
+               std::vector<atom*> *,
+               std::pair<atomId_t,atom*>)>(&AtomDescriptor_impl::checkAndAdd),
+                       this,boost::cref(&res),_1));
+  return res;
+}
+
+vector<const atom*> AtomDescriptor_impl::findAll() const {
+  vector<const atom*> res;
+  const World::AtomSet &atoms = getAtoms();
+  for_each(atoms.begin(),
+           atoms.end(),
+           boost::bind(static_cast<void (AtomDescriptor_impl::*)(
+               std::vector<const atom*> *,
+               std::pair<atomId_t,const atom*>) const>(&AtomDescriptor_impl::checkAndAdd),
+                       boost::cref(this),&res,_1));
   return res;
 }
@@ -122 +155 @@
 }
 
+void AtomDescriptor_impl::checkAndAdd(std::vector<const atom*> *v,std::pair<atomId_t,const atom*> p) const{
+  if(predicate(p)){
+    v->push_back(p.second);
+  }
+}
+
 /************************** Universe and Emptyset *****************/
 
@@ -130 +169 @@
 {}
 
-bool AtomAllDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
+bool AtomAllDescriptor_impl::predicate(std::pair<atomId_t,const atom*>) const{
   return true;
 }
@@ -144 +183 @@
 {}
 
-bool AtomNoneDescriptor_impl::predicate(std::pair<atomId_t,atom*>){
+bool AtomNoneDescriptor_impl::predicate(std::pair<atomId_t,const atom*>) const{
   return false;
 }
@@ -162 +201 @@
 {}
 
-bool AtomAndDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomAndDescriptor_impl::predicate(std::pair<atomId_t,const atom*> atom) const{
   return lhs->predicate(atom) && rhs->predicate(atom);
 }
@@ -178 +217 @@
 }
 
-bool AtomOrDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomOrDescriptor_impl::predicate(std::pair<atomId_t,const atom*> atom) const{
   return lhs->predicate(atom) || rhs->predicate(atom);
 }
@@ -198 +237 @@
 }
 
-bool AtomNotDescriptor_impl::predicate(std::pair<atomId_t,atom*> atom){
+bool AtomNotDescriptor_impl::predicate(std::pair<atomId_t,const atom*> atom) const{
  return !(arg->predicate(atom));
 }