Changeset 1259df for src/Actions/SelectionAction

Timestamp:

Jul 24, 2015, 4:44:34 PM (9 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, 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:

f01769

Parents:

63fb7a

git-author:

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

git-committer:

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

Message:

Replaced World::getAllMolecules() wherever possible by const version.

Location:

src/Actions/SelectionAction/Molecules

Files:

• MoleculeByFormulaAction.cpp (modified) (2 diffs)
• MoleculeByFormulaAction.def (modified) (1 diff)
• MoleculeByNameAction.cpp (modified) (2 diffs)
• MoleculeByNameAction.def (modified) (1 diff)
• NotMoleculeByFormulaAction.cpp (modified) (2 diffs)
• NotMoleculeByFormulaAction.def (modified) (1 diff)
• NotMoleculeByNameAction.cpp (modified) (2 diffs)
• NotMoleculeByNameAction.def (modified) (1 diff)

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.cpp

@@ -56 +56 @@
 ActionState::ptr SelectionMoleculeByFormulaAction::performCall() {
   LOG(1, "Selecting molecules with chemical formula " << params.formula.get() << ":");
-//  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula.get()));
-  std::vector<molecule *> selectedMolecules =
-      World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByFormula(params.formula.get()));
+  std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).
+      getAllMolecules(MoleculesBySelection() && MoleculeByFormula(params.formula.get()));
 //  BOOST_FOREACH(molecule *mol, matchingMolecules)
 //    LOG(1, "\t" << mol->getId() << ", " << mol->getName() << ".");
@@ -70 +70 @@
 
   World::getInstance().unselectAllMolecules(MoleculeByFormula(state->params.formula.get()));
-  BOOST_FOREACH( molecule *mol, state->selectedMolecules)
+  BOOST_FOREACH( const molecule *mol, state->selectedMolecules)
     World::getInstance().selectMolecule(mol);
 

src/Actions/SelectionAction/Molecules/MoleculeByFormulaAction.def

@@ -22 +22 @@
 (FormulaValidator())
 
-#define statetypes (std::vector<molecule*>)
+#define statetypes (std::vector<const molecule*>)
 #define statereferences (selectedMolecules)
 

src/Actions/SelectionAction/Molecules/MoleculeByNameAction.cpp

@@ -56 +56 @@
 ActionState::ptr SelectionMoleculeByNameAction::performCall() {
   LOG(1, "Selecting all molecules called " << params.molname.get());
-  std::vector<molecule *> selectedMolecules =
-      World::getInstance().getAllMolecules(MoleculesBySelection() && MoleculeByName(params.molname.get()));
+  std::vector<const molecule *> selectedMolecules =
+      const_cast<const World &>(World::getInstance()).
+      getAllMolecules(MoleculesBySelection() && MoleculeByName(params.molname.get()));
   World::getInstance().selectAllMolecules(MoleculeByName(params.molname.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules selected.");
@@ -68 +69 @@
 
   World::getInstance().unselectAllMolecules(MoleculeByName(state->params.molname.get()));
-  BOOST_FOREACH( molecule *mol, state->selectedMolecules)
+  BOOST_FOREACH( const molecule *mol, state->selectedMolecules)
     World::getInstance().selectMolecule(mol);
 

src/Actions/SelectionAction/Molecules/MoleculeByNameAction.def

@@ -24 +24 @@
 (DummyValidator< std::string >())
 
-#define statetypes (std::vector<molecule *>)
+#define statetypes (std::vector<const molecule *>)
 #define statereferences (selectedMolecules)
 

src/Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.cpp

@@ -56 +56 @@
 ActionState::ptr SelectionNotMoleculeByFormulaAction::performCall() {
   LOG(1, "Unselecting molecules with chemical formula " << params.formula.get() << ":");
-  std::vector<molecule *> matchingMolecules = World::getInstance().getAllMolecules(MoleculeByFormula(params.formula.get()));
-  std::vector<molecule *> unselectedMolecules = World::getInstance().getAllMolecules(!MoleculesBySelection());
+  std::vector<const molecule *> matchingMolecules =
+      const_cast<const World &>(World::getInstance()).
+      getAllMolecules(MoleculeByFormula(params.formula.get()));
+  std::vector<const molecule *> unselectedMolecules =
+      const_cast<const World &>(World::getInstance()).
+      getAllMolecules(!MoleculesBySelection());
   World::getInstance().unselectAllMolecules(MoleculeByFormula(params.formula.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
@@ -67 +71 @@
 
   World::getInstance().selectAllMolecules(MoleculeByFormula(state->params.formula.get()));
-  BOOST_FOREACH( molecule *mol, state->unselectedMolecules)
+  BOOST_FOREACH( const molecule *mol, state->unselectedMolecules)
     World::getInstance().unselectMolecule(mol);
 

src/Actions/SelectionAction/Molecules/NotMoleculeByFormulaAction.def

@@ -22 +22 @@
 (FormulaValidator())
 
-#define statetypes (std::vector<molecule*>)
+#define statetypes (std::vector<const molecule*>)
 #define statereferences (unselectedMolecules)
 

src/Actions/SelectionAction/Molecules/NotMoleculeByNameAction.cpp

@@ -56 +56 @@
 ActionState::ptr SelectionNotMoleculeByNameAction::performCall() {
   LOG(1, "Unselecting all molecule called " << params.molname.get());
-  std::vector<molecule *> unselectedMolecules =
-      World::getInstance().getAllMolecules((!MoleculesBySelection()) && MoleculeByName(params.molname.get()));
+  std::vector<const molecule *> unselectedMolecules =
+      const_cast<const World &>(World::getInstance()).
+        getAllMolecules((!MoleculesBySelection()) && MoleculeByName(params.molname.get()));
   World::getInstance().unselectAllMolecules(MoleculeByName(params.molname.get()));
   LOG(0, World::getInstance().countSelectedMolecules() << " molecules remain selected.");
@@ -68 +69 @@
 
   World::getInstance().selectAllMolecules(MoleculeByName(state->params.molname.get()));
-  BOOST_FOREACH( molecule *mol, state->unselectedMolecules)
+  BOOST_FOREACH( const molecule *mol, state->unselectedMolecules)
     World::getInstance().unselectMolecule(mol);
 

src/Actions/SelectionAction/Molecules/NotMoleculeByNameAction.def

@@ -22 +22 @@
 (DummyValidator< std::string >())
 
-#define statetypes (std::vector<molecule *>)
+#define statetypes (std::vector<const molecule *>)
 #define statereferences (unselectedMolecules)