Changeset b5b01e for src/Actions/GraphAction

Timestamp:

Sep 19, 2013, 8:23:52 PM (12 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:

6367dd

Parents:

f92ef3

git-author:

Frederik Heber <heber@…> (08/19/13 19:04:10)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

ActionState extracted into own header file, rename Action::state_ptr -> ActionState::ptr.

Location:

src/Actions/GraphAction

Files:

• CreateAdjacencyAction.cpp (modified) (4 diffs)
• DepthFirstSearchAction.cpp (modified) (2 diffs)
• DestroyAdjacencyAction.cpp (modified) (4 diffs)
• SubgraphDissectionAction.cpp (modified) (4 diffs)
• SubgraphDissectionAction.hpp (modified) (1 diff)
• UpdateMoleculesAction.cpp (modified) (3 diffs)

src/Actions/GraphAction/CreateAdjacencyAction.cpp

@@ -63 +63 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr GraphCreateAdjacencyAction::performCall() {
+ActionState::ptr GraphCreateAdjacencyAction::performCall() {
   BondGraph *BG = World::getInstance().getBondGraph();
   ASSERT(BG != NULL, "GraphCreateAdjacencyAction: BondGraph is NULL.");
@@ -115 +115 @@
   LOG(0, "STATUS: Recognized " << BondCount << " bonds.");
 
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr GraphCreateAdjacencyAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr GraphCreateAdjacencyAction::performUndo(ActionState::ptr _state) {
   GraphCreateAdjacencyState *state = assert_cast<GraphCreateAdjacencyState*>(_state.get());
 
@@ -142 +142 @@
     CurrentBond->setDegree(iter->degree);
   }
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr GraphCreateAdjacencyAction::performRedo(Action::state_ptr _state){
+ActionState::ptr GraphCreateAdjacencyAction::performRedo(ActionState::ptr _state){
   BondGraph *BG = World::getInstance().getBondGraph();
   ASSERT(BG != NULL, "GraphCreateAdjacencyAction: BondGraph is NULL.");
@@ -153 +153 @@
   BG->CreateAdjacency(Set);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/GraphAction/DepthFirstSearchAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr GraphDepthFirstSearchAction::performCall() {
+ActionState::ptr GraphDepthFirstSearchAction::performCall() {
   LOG(1, "Depth-First-Search Analysis.");
   ListOfLocalAtoms_t ListOfAtoms;
@@ -84 +84 @@
 }
 
-Action::state_ptr GraphDepthFirstSearchAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr GraphDepthFirstSearchAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr GraphDepthFirstSearchAction::performRedo(Action::state_ptr _state){
+ActionState::ptr GraphDepthFirstSearchAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/GraphAction/DestroyAdjacencyAction.cpp

@@ -65 +65 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr GraphDestroyAdjacencyAction::performCall() {
+ActionState::ptr GraphDestroyAdjacencyAction::performCall() {
   BondGraph *BG = World::getInstance().getBondGraph();
   ASSERT(BG != NULL, "GraphDestroyAdjacencyAction: BondGraph is NULL.");
@@ -115 +115 @@
   BG->cleanAdjacencyList(Set);
 
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr GraphDestroyAdjacencyAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr GraphDestroyAdjacencyAction::performUndo(ActionState::ptr _state) {
   GraphDestroyAdjacencyState *state = assert_cast<GraphDestroyAdjacencyState*>(_state.get());
 
@@ -134 +134 @@
     CurrentBond->setDegree(iter->degree);
   }
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr GraphDestroyAdjacencyAction::performRedo(Action::state_ptr _state){
+ActionState::ptr GraphDestroyAdjacencyAction::performRedo(ActionState::ptr _state){
   BondGraph *BG = World::getInstance().getBondGraph();
   ASSERT(BG != NULL, "GraphDestroyAdjacencyAction: BondGraph is NULL.");
@@ -144 +144 @@
   BG->cleanAdjacencyList(Set);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/GraphAction/SubgraphDissectionAction.cpp

@@ -108 +108 @@
 }
 
-Action::state_ptr GraphSubgraphDissectionAction::performCall(){
+ActionState::ptr GraphSubgraphDissectionAction::performCall(){
   // we need to "emulate" that all atoms have been selected without destroying
   // current selection
@@ -114 +114 @@
   const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   World::getInstance().selectAllAtoms(AllAtoms());
-  Action::state_ptr state(MakroAction::performCall());
+  ActionState::ptr state(MakroAction::performCall());
   reselectAtoms(selected_atoms);
   Chronos::getInstance().endTiming(TOKEN);
@@ -121 +121 @@
 }
 
-Action::state_ptr GraphSubgraphDissectionAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr GraphSubgraphDissectionAction::performUndo(ActionState::ptr _state) {
   // we need to "emulate" that all atoms have been selected without destroying
   // current selection
   const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   World::getInstance().selectAllAtoms(AllAtoms());
-  Action::state_ptr state(MakroAction::performUndo(_state));
+  ActionState::ptr state(MakroAction::performUndo(_state));
   reselectAtoms(selected_atoms);
 
@@ -132 +132 @@
 }
 
-Action::state_ptr GraphSubgraphDissectionAction::performRedo(Action::state_ptr _state){
+ActionState::ptr GraphSubgraphDissectionAction::performRedo(ActionState::ptr _state){
   // we need to "emulate" that all atoms have been selected without destroying
   // current selection
   const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
   World::getInstance().selectAllAtoms(AllAtoms());
-  Action::state_ptr state(MakroAction::performRedo(_state));
+  ActionState::ptr state(MakroAction::performRedo(_state));
   reselectAtoms(selected_atoms);
 

src/Actions/GraphAction/SubgraphDissectionAction.hpp

@@ -97 +97 @@
   void unprepare(ActionRegistry &AR);
 
-  virtual Action::state_ptr performCall();
-  virtual Action::state_ptr performUndo(Action::state_ptr);
-  virtual Action::state_ptr performRedo(Action::state_ptr);
+  virtual ActionState::ptr performCall();
+  virtual ActionState::ptr performUndo(ActionState::ptr);
+  virtual ActionState::ptr performRedo(ActionState::ptr);
 
 private:

src/Actions/GraphAction/UpdateMoleculesAction.cpp

@@ -63 +63 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr GraphUpdateMoleculesAction::performCall() {
+ActionState::ptr GraphUpdateMoleculesAction::performCall() {
   // first create stuff for undo state
   LOG(0, "STATUS: Creating undo state.");
@@ -98 +98 @@
   LOG(1, "I scanned " << World::getInstance().numMolecules() << " molecules.");
 
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr GraphUpdateMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr GraphUpdateMoleculesAction::performUndo(ActionState::ptr _state) {
   GraphUpdateMoleculesState *state = assert_cast<GraphUpdateMoleculesState*>(_state.get());
 
@@ -130 +130 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr GraphUpdateMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr GraphUpdateMoleculesAction::performRedo(ActionState::ptr _state){
   return performCall();
 }