Changeset b5b01e for src/Actions/AtomAction

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/AtomAction

Files:

• AddAction.cpp (modified) (4 diffs)
• ChangeElementAction.cpp (modified) (4 diffs)
• RemoveAction.cpp (modified) (3 diffs)
• RotateAroundOriginByAngleAction.cpp (modified) (4 diffs)
• SaveSelectedAtomsAction.cpp (modified) (3 diffs)
• TranslateAction.cpp (modified) (4 diffs)

src/Actions/AtomAction/AddAction.cpp ¶

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomAddAction::performCall() {
+ActionState::ptr AtomAddAction::performCall() {
   // execute action
   atom * first = World::getInstance().createAtom();
@@ -67 +67 @@
     (*iter)->AddAtom(first);
   }
-  return Action::state_ptr(new AtomAddState(first->getId(), params));
+  return ActionState::ptr(new AtomAddState(first->getId(), params));
 }
 
-Action::state_ptr AtomAddAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomAddAction::performUndo(ActionState::ptr _state) {
   AtomAddState *state = assert_cast<AtomAddState*>(_state.get());
 
@@ -76 +76 @@
   World::getInstance().destroyAtom(state->id);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr AtomAddAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomAddAction::performRedo(ActionState::ptr _state){
   AtomAddState *state = assert_cast<AtomAddState*>(_state.get());
 
@@ -95 +95 @@
     if (!first->changeId(state->id))
       return Action::failure;
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/AtomAction/ChangeElementAction.cpp ¶

@@ -56 +56 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomChangeElementAction::performCall() {
+ActionState::ptr AtomChangeElementAction::performCall() {
   atom *first = NULL;
   molecule *mol = NULL;
@@ -75 +75 @@
     mol->AddAtom(first);  // add atom to ensure correctness of formula
   }
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr AtomChangeElementAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomChangeElementAction::performUndo(ActionState::ptr _state) {
   AtomChangeElementState *state = assert_cast<AtomChangeElementState*>(_state.get());
   atom *first = NULL;
@@ -91 +91 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr AtomChangeElementAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomChangeElementAction::performRedo(ActionState::ptr _state){
   AtomChangeElementState *state = assert_cast<AtomChangeElementState*>(_state.get());
   atom *first = NULL;
@@ -107 +107 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/AtomAction/RemoveAction.cpp ¶

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomRemoveAction::performCall() {
+ActionState::ptr AtomRemoveAction::performCall() {
   // create undo state
   std::vector<AtomicInfo> Walkers;
@@ -72 +72 @@
     World::getInstance().destroyAtom((iter->second));
   }
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr AtomRemoveAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomRemoveAction::performUndo(ActionState::ptr _state) {
   AtomRemoveState *state = assert_cast<AtomRemoveState*>(_state.get());
 
   // add all removed atoms again
   if (AddAtomsFromAtomicInfo(state->Walkers))
-    return Action::state_ptr(_state);
+    return ActionState::ptr(_state);
   else
     return Action::failure;
 }
 
-Action::state_ptr AtomRemoveAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomRemoveAction::performRedo(ActionState::ptr _state){
   AtomRemoveState *state = assert_cast<AtomRemoveState*>(_state.get());
 
@@ -91 +91 @@
   RemoveAtomsFromAtomicInfo(state->Walkers);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp ¶

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomRotateAroundOriginByAngleAction::performCall() {
+ActionState::ptr AtomRotateAroundOriginByAngleAction::performCall() {
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
 
@@ -74 +74 @@
   }
   LOG(0, "done.");
-  return Action::state_ptr(new AtomRotateAroundOriginByAngleState(World::getInstance().getSelectedAtoms(), params));
+  return ActionState::ptr(new AtomRotateAroundOriginByAngleState(World::getInstance().getSelectedAtoms(), params));
 }
 
-Action::state_ptr AtomRotateAroundOriginByAngleAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomRotateAroundOriginByAngleAction::performUndo(ActionState::ptr _state) {
   AtomRotateAroundOriginByAngleState *state = assert_cast<AtomRotateAroundOriginByAngleState*>(_state.get());
 
@@ -90 +90 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr AtomRotateAroundOriginByAngleAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomRotateAroundOriginByAngleAction::performRedo(ActionState::ptr _state){
   AtomRotateAroundOriginByAngleState *state = assert_cast<AtomRotateAroundOriginByAngleState*>(_state.get());
 
@@ -106 +106 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/AtomAction/SaveSelectedAtomsAction.cpp ¶

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomSaveSelectedAtomsAction::performCall() {
+ActionState::ptr AtomSaveSelectedAtomsAction::performCall() {
   LOG(1, "Storing selected atoms to file " << params.filename.get() << ".");
 
@@ -81 +81 @@
 }
 
-Action::state_ptr AtomSaveSelectedAtomsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomSaveSelectedAtomsAction::performUndo(ActionState::ptr _state) {
 //  ParserSaveXyzState *state = assert_cast<ParserSaveXyzState*>(_state.get());
 
@@ -88 +88 @@
 //  state->mol->setName(state->lastName);
 //
-//  return Action::state_ptr(new ParserSaveXyzState(state->mol,newName));
+//  return ActionState::ptr(new ParserSaveXyzState(state->mol,newName));
 }
 
-Action::state_ptr AtomSaveSelectedAtomsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomSaveSelectedAtomsAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 //  // Undo and redo have to do the same for this action

src/Actions/AtomAction/TranslateAction.cpp ¶

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr AtomTranslateAction::performCall() {
+ActionState::ptr AtomTranslateAction::performCall() {
   Box &domain = World::getInstance().getDomain();
   std::vector<atom *> selectedAtoms = World::getInstance().getSelectedAtoms();
@@ -64 +64 @@
   }
 
-  return Action::state_ptr(new AtomTranslateState(selectedAtoms, params));
+  return ActionState::ptr(new AtomTranslateState(selectedAtoms, params));
 }
 
-Action::state_ptr AtomTranslateAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr AtomTranslateAction::performUndo(ActionState::ptr _state) {
   AtomTranslateState *state = assert_cast<AtomTranslateState*>(_state.get());
   Box &domain = World::getInstance().getDomain();
@@ -77 +77 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr AtomTranslateAction::performRedo(Action::state_ptr _state){
+ActionState::ptr AtomTranslateAction::performRedo(ActionState::ptr _state){
   AtomTranslateState *state = assert_cast<AtomTranslateState*>(_state.get());
   Box &domain = World::getInstance().getDomain();
@@ -90 +90 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }