Changeset a58c16 for src/Actions/SelectionAction

Timestamp:

Jul 24, 2015, 4:44:35 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:

99db9b

Parents:

f01769

git-author:

Frederik Heber <heber@…> (06/01/15 19:16:02)

git-committer:

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

Message:

Replaced World::getAllAtoms() by const version where possible.

Location:

src/Actions/SelectionAction/Atoms

Files:

• AllAtomsInsideVolumeAction.cpp (modified) (2 diffs)
• AllAtomsInsideVolumeAction.def (modified) (1 diff)
• AllAtomsOfMoleculeAction.cpp (modified) (2 diffs)
• AllAtomsOfMoleculeAction.def (modified) (1 diff)
• AtomByElementAction.cpp (modified) (2 diffs)
• AtomByElementAction.def (modified) (1 diff)
• NotAllAtomsInsideVolumeAction.cpp (modified) (2 diffs)
• NotAllAtomsInsideVolumeAction.def (modified) (1 diff)
• NotAllAtomsOfMoleculeAction.cpp (modified) (2 diffs)
• NotAllAtomsOfMoleculeAction.def (modified) (1 diff)
• NotAtomByElementAction.cpp (modified) (2 diffs)
• NotAtomByElementAction.def (modified) (1 diff)

src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.cpp

@@ -64 +64 @@
     return Action::failure;
   }
-  std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
+  std::vector<const atom *> selectedAtoms = const_cast<const World &>(World::getInstance()).
+      getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
@@ -75 +76 @@
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
-  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/AllAtomsInsideVolumeAction.def

@@ -19 +19 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (selectedAtoms)
 

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.cpp

@@ -57 +57 @@
 ActionState::ptr SelectionAllAtomsOfMoleculeAction::performCall() {
   LOG(1, "Selecting all atoms of currently selected molecule.");
-  std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
+  std::vector<const atom *> selectedAtoms = const_cast<const World &>(World::getInstance()).
+      getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomsByMoleculeSelection());
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
@@ -67 +68 @@
 
   World::getInstance().clearAtomSelection();
-  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/AllAtomsOfMoleculeAction.def

@@ -21 +21 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (selectedAtoms)
 

src/Actions/SelectionAction/Atoms/AtomByElementAction.cpp

@@ -57 +57 @@
 ActionState::ptr SelectionAtomByElementAction::performCall() {
   LOG(1, "Selecting atoms of type " << *params.elemental.get());
-  std::vector<atom *> selectedAtoms = World::getInstance().getAllAtoms(AtomsBySelection());
+  std::vector<const atom *> selectedAtoms =
+      const_cast<const World &>(World::getInstance()).getAllAtoms(AtomsBySelection());
   World::getInstance().selectAllAtoms(AtomByType(params.elemental.get()));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms selected.");
@@ -67 +68 @@
 
   World::getInstance().unselectAllAtoms(AtomByType(state->params.elemental.get()));
-  BOOST_FOREACH(atom *_atom, state->selectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->selectedAtoms)
     World::getInstance().selectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/AtomByElementAction.def

@@ -22 +22 @@
 (ElementValidator())
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (selectedAtoms)
 

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.cpp

@@ -63 +63 @@
     return Action::failure;
   }
-  std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms((!AtomsBySelection()) && AtomsByShape(*selectedShapes[0]));
+  std::vector<const atom *> unselectedAtoms = const_cast<const World &>(World::getInstance()).
+      getAllAtoms((!AtomsBySelection()) && AtomsByShape(*selectedShapes[0]));
   World::getInstance().unselectAllAtoms(AtomsByShape(*selectedShapes[0]));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
@@ -74 +75 @@
   std::vector<Shape*> selectedShapes = ShapeRegistry::getInstance().getSelectedShapes();
   World::getInstance().selectAllAtoms(AtomsByShape(*selectedShapes[0]));
-  BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->unselectedAtoms)
     World::getInstance().unselectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/NotAllAtomsInsideVolumeAction.def

@@ -18 +18 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (unselectedAtoms)
 

src/Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.cpp

@@ -57 +57 @@
 ActionState::ptr SelectionNotAllAtomsOfMoleculeAction::performCall() {
   LOG(1, "Unselecting all atoms of currently selected molecules.");
-  std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
+  std::vector<const atom *> unselectedAtoms = const_cast<const World &>(World::getInstance()).
+      getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomsByMoleculeSelection());
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
@@ -67 +68 @@
 
   World::getInstance().selectAllAtoms(AllAtoms());
-  BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->unselectedAtoms)
     World::getInstance().unselectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/NotAllAtomsOfMoleculeAction.def

@@ -21 +21 @@
 #undef paramvalids
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (unselectedAtoms)
 

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.cpp

@@ -57 +57 @@
 ActionState::ptr SelectionNotAtomByElementAction::performCall() {
   LOG(1, "Unselecting atoms of type " << *params.elemental.get());
-  std::vector<atom *> unselectedAtoms = World::getInstance().getAllAtoms(!AtomsBySelection());
+  std::vector<const atom *> unselectedAtoms = const_cast<const World &>(World::getInstance()).
+      getAllAtoms(!AtomsBySelection());
   World::getInstance().unselectAllAtoms(AtomByType(params.elemental.get()));
   LOG(0, World::getInstance().countSelectedAtoms() << " atoms remain selected.");
@@ -67 +68 @@
 
   World::getInstance().selectAllAtoms(AtomByType(state->params.elemental.get()));
-  BOOST_FOREACH(atom *_atom, state->unselectedAtoms)
+  BOOST_FOREACH(const atom *_atom, state->unselectedAtoms)
     World::getInstance().unselectAtom(_atom);
 

src/Actions/SelectionAction/Atoms/NotAtomByElementAction.def

@@ -22 +22 @@
 (ElementValidator())
 
-#define statetypes (std::vector<atom*>)
+#define statetypes (std::vector<const atom*>)
 #define statereferences (unselectedAtoms)