Changeset b5b01e for src/Actions/MoleculeAction

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

Files:

• BondFileAction.cpp (modified) (3 diffs)
• ChangeBondAngleAction.cpp (modified) (4 diffs)
• ChangeNameAction.cpp (modified) (3 diffs)
• CopyAction.cpp (modified) (2 diffs)
• FillVoidWithMoleculeAction.cpp (modified) (3 diffs)
• FillWithMoleculeAction.cpp (modified) (3 diffs)
• LinearInterpolationofTrajectoriesAction.cpp (modified) (3 diffs)
• LoadAction.cpp (modified) (5 diffs)
• RotateAroundSelfByAngleAction.cpp (modified) (4 diffs)
• RotateToPrincipalAxisSystemAction.cpp (modified) (3 diffs)
• SaveAdjacencyAction.cpp (modified) (3 diffs)
• SaveBondsAction.cpp (modified) (3 diffs)
• SaveSelectedMoleculesAction.cpp (modified) (3 diffs)
• SaveTemperatureAction.cpp (modified) (3 diffs)
• StretchBondAction.cpp (modified) (4 diffs)
• SuspendInWaterAction.cpp (modified) (3 diffs)
• VerletIntegrationAction.cpp (modified) (3 diffs)

src/Actions/MoleculeAction/BondFileAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeBondFileAction::performCall() {
+ActionState::ptr MoleculeBondFileAction::performCall() {
   molecule *mol = NULL;
 
@@ -71 +71 @@
 }
 
-Action::state_ptr MoleculeBondFileAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeBondFileAction::performUndo(ActionState::ptr _state) {
 //  MoleculeBondFileState *state = assert_cast<MoleculeBondFileState*>(_state.get());
 
@@ -80 +80 @@
 }
 
-Action::state_ptr MoleculeBondFileAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeBondFileAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 }

src/Actions/MoleculeAction/ChangeBondAngleAction.cpp

@@ -115 +115 @@
 }
 
-Action::state_ptr MoleculeChangeBondAngleAction::performCall()
+ActionState::ptr MoleculeChangeBondAngleAction::performCall()
 {
   // check precondition: three atoms
@@ -148 +148 @@
       atoms[ indices[1] ]->getPosition(), atoms[ indices[2] ]->getPosition(),
       params);
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr MoleculeChangeBondAngleAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeChangeBondAngleAction::performUndo(ActionState::ptr _state) {
   MoleculeChangeBondAngleState *state = assert_cast<MoleculeChangeBondAngleState*>(_state.get());
 
@@ -160 +160 @@
   second->setPosition(state->secondOldPosition);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeChangeBondAngleAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeChangeBondAngleAction::performRedo(ActionState::ptr _state){
   MoleculeChangeBondAngleState *state = assert_cast<MoleculeChangeBondAngleState*>(_state.get());
 
@@ -172 +172 @@
   second->setPosition(state->secondNewPosition);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/MoleculeAction/ChangeNameAction.cpp

@@ -49 +49 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeChangeNameAction::performCall() {
+ActionState::ptr MoleculeChangeNameAction::performCall() {
   molecule *mol = NULL;
 
@@ -56 +56 @@
     string oldName = mol->getName();
     mol->setName(params.name.get());
-    return Action::state_ptr(new MoleculeChangeNameState(mol,params));
+    return ActionState::ptr(new MoleculeChangeNameState(mol,params));
   } else
     return Action::failure;
 }
 
-Action::state_ptr MoleculeChangeNameAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeChangeNameAction::performUndo(ActionState::ptr _state) {
   MoleculeChangeNameState *state = assert_cast<MoleculeChangeNameState*>(_state.get());
 
@@ -68 +68 @@
   state->params.name.set(newName);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeChangeNameAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeChangeNameAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/CopyAction.cpp

@@ -57 +57 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeCopyAction::performCall()
+ActionState::ptr MoleculeCopyAction::performCall()
 {
   std::vector<moleculeId_t> molecules;
@@ -71 +71 @@
   }
 
-  return Action::state_ptr(new MoleculeCopyState(molecules,params));
+  return ActionState::ptr(new MoleculeCopyState(molecules,params));
 }
 
-Action::state_ptr MoleculeCopyAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeCopyAction::performUndo(ActionState::ptr _state) {
   MoleculeCopyState *state = assert_cast<MoleculeCopyState*>(_state.get());
 
   RemoveMoleculesWithAtomsByIds(state->copies);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeCopyAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeCopyAction::performRedo(ActionState::ptr _state){
   return performCall();
 }

src/Actions/MoleculeAction/FillVoidWithMoleculeAction.cpp

@@ -60 +60 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeFillVoidWithMoleculeAction::performCall() {
+ActionState::ptr MoleculeFillVoidWithMoleculeAction::performCall() {
   if (!boost::filesystem::exists(params.fillername.get())) {
     ELOG(1, "File with filler molecule " << params.fillername.get() << " does not exist!");
@@ -123 +123 @@
 //  LOG(0, fillermolecules.size() << " molecules have been inserted.");
 
-  return Action::state_ptr(new MoleculeFillVoidWithMoleculeState(fillermolecules,params));
+  return ActionState::ptr(new MoleculeFillVoidWithMoleculeState(fillermolecules,params));
 }
 
-Action::state_ptr MoleculeFillVoidWithMoleculeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeFillVoidWithMoleculeAction::performUndo(ActionState::ptr _state) {
   MoleculeFillVoidWithMoleculeState *state = assert_cast<MoleculeFillVoidWithMoleculeState*>(_state.get());
 
@@ -146 +146 @@
   // as molecules and atoms from state are removed, we have to create a new one
   std::vector<molecule *> fillermolecules;
-  return Action::state_ptr(new MoleculeFillVoidWithMoleculeState(fillermolecules,state->params));
+  return ActionState::ptr(new MoleculeFillVoidWithMoleculeState(fillermolecules,state->params));
 }
 
-Action::state_ptr MoleculeFillVoidWithMoleculeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeFillVoidWithMoleculeAction::performRedo(ActionState::ptr _state){
   //MoleculeFillVoidWithMoleculeState *state = assert_cast<MoleculeFillVoidWithMoleculeState*>(_state.get());
 
   return Action::failure;
-  //return Action::state_ptr(_state);
+  //return ActionState::ptr(_state);
 }
 

src/Actions/MoleculeAction/FillWithMoleculeAction.cpp

@@ -58 +58 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeFillWithMoleculeAction::performCall() {
+ActionState::ptr MoleculeFillWithMoleculeAction::performCall() {
 
   LOG(1, "INFO: Filling Box with water molecules, "
@@ -127 +127 @@
 //  LOG(0, fillermolecules.size() << " molecules have been inserted.");
 
-  return Action::state_ptr(new MoleculeFillWithMoleculeState(fillermolecules,params));
+  return ActionState::ptr(new MoleculeFillWithMoleculeState(fillermolecules,params));
 }
 
-Action::state_ptr MoleculeFillWithMoleculeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeFillWithMoleculeAction::performUndo(ActionState::ptr _state) {
   MoleculeFillWithMoleculeState *state = assert_cast<MoleculeFillWithMoleculeState*>(_state.get());
 
@@ -150 +150 @@
   // as molecules and atoms from state are removed, we have to create a new one
   std::vector<molecule *> fillermolecules;
-  return Action::state_ptr(new MoleculeFillWithMoleculeState(fillermolecules,state->params));
+  return ActionState::ptr(new MoleculeFillWithMoleculeState(fillermolecules,state->params));
 }
 
-Action::state_ptr MoleculeFillWithMoleculeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeFillWithMoleculeAction::performRedo(ActionState::ptr _state){
   //MoleculeFillWithMoleculeState *state = assert_cast<MoleculeFillWithMoleculeState*>(_state.get());
 
   return Action::failure;
-  //return Action::state_ptr(_state);
+  //return ActionState::ptr(_state);
 }
 

src/Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp

@@ -57 +57 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeLinearInterpolationofTrajectoriesAction::performCall() {
+ActionState::ptr MoleculeLinearInterpolationofTrajectoriesAction::performCall() {
   LOG(0, "STATUS: Linear interpolation between configuration " << params.start.get() << " and " << params.end.get() << "." << endl);
   ASSERT(params.end.get() > params.start.get(), "MoleculeLinearInterpolationofTrajectoriesAction() - start step greater than end step.");
@@ -68 +68 @@
 }
 
-Action::state_ptr MoleculeLinearInterpolationofTrajectoriesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeLinearInterpolationofTrajectoriesAction::performUndo(ActionState::ptr _state) {
 //  MoleculeLinearInterpolationofTrajectoriesState *state = assert_cast<MoleculeLinearInterpolationofTrajectoriesState*>(_state.get());
 
@@ -77 +77 @@
 }
 
-Action::state_ptr MoleculeLinearInterpolationofTrajectoriesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeLinearInterpolationofTrajectoriesAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/LoadAction.cpp

@@ -57 +57 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeLoadAction::performCall() {
+ActionState::ptr MoleculeLoadAction::performCall() {
   // parsing file if present
   if (!boost::filesystem::exists(params.filename.get())) {
@@ -98 +98 @@
     LOG(0, "Chemical formula is " << (*iter)->getFormula());
 
-    return Action::state_ptr(
+    return ActionState::ptr(
         new MoleculeLoadState((*iter)->getId(),FilenamePrefix,FilenameSuffix,boost::shared_ptr<FormatParser_Parameters>(ParserParams),params)
     );
@@ -104 +104 @@
 }
 
-Action::state_ptr MoleculeLoadAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeLoadAction::performUndo(ActionState::ptr _state) {
   MoleculeLoadState *state = assert_cast<MoleculeLoadState*>(_state.get());
 
@@ -119 +119 @@
     ParserParams->makeClone(*state->ParserParameters);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeLoadAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeLoadAction::performRedo(ActionState::ptr _state){
   MoleculeLoadState *state = assert_cast<MoleculeLoadState*>(_state.get());
 
@@ -145 +145 @@
   LOG(0, "Chemical formula is " << (*iter)->getFormula());
 
-  return Action::state_ptr(
+  return ActionState::ptr(
       new MoleculeLoadState((*iter)->getId(),state->FilenamePrefix,state->FilenameSuffix,boost::shared_ptr<FormatParser_Parameters>(ParserParams),params)
   );

src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeRotateAroundSelfByAngleAction::performCall() {
+ActionState::ptr MoleculeRotateAroundSelfByAngleAction::performCall() {
   // check whether a molecule is selected
   std::vector<molecule *> selectedMolecules = World::getInstance().getSelectedMolecules();
@@ -82 +82 @@
   }
 
-  return Action::state_ptr(new MoleculeRotateAroundSelfByAngleState(selectedMolecules, params));
+  return ActionState::ptr(new MoleculeRotateAroundSelfByAngleState(selectedMolecules, params));
 }
 
-Action::state_ptr MoleculeRotateAroundSelfByAngleAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeRotateAroundSelfByAngleAction::performUndo(ActionState::ptr _state) {
   MoleculeRotateAroundSelfByAngleState *state = assert_cast<MoleculeRotateAroundSelfByAngleState*>(_state.get());
 
@@ -100 +100 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeRotateAroundSelfByAngleAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeRotateAroundSelfByAngleAction::performRedo(ActionState::ptr _state){
   MoleculeRotateAroundSelfByAngleState *state = assert_cast<MoleculeRotateAroundSelfByAngleState*>(_state.get());
 
@@ -118 +118 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performCall() {
+ActionState::ptr MoleculeRotateToPrincipalAxisSystemAction::performCall() {
   molecule *mol = NULL;
 
@@ -72 +72 @@
 }
 
-Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeRotateToPrincipalAxisSystemAction::performUndo(ActionState::ptr _state) {
 //  MoleculeRotateToPrincipalAxisSystemState *state = assert_cast<MoleculeRotateToPrincipalAxisSystemState*>(_state.get());
 
@@ -81 +81 @@
 }
 
-Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeRotateToPrincipalAxisSystemAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 }

src/Actions/MoleculeAction/SaveAdjacencyAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeSaveAdjacencyAction::performCall() {
+ActionState::ptr MoleculeSaveAdjacencyAction::performCall() {
   molecule *mol = NULL;
 
@@ -76 +76 @@
 }
 
-Action::state_ptr MoleculeSaveAdjacencyAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeSaveAdjacencyAction::performUndo(ActionState::ptr _state) {
 //  MoleculeSaveAdjacencyState *state = assert_cast<MoleculeSaveAdjacencyState*>(_state.get());
 
@@ -85 +85 @@
 }
 
-Action::state_ptr MoleculeSaveAdjacencyAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeSaveAdjacencyAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/SaveBondsAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeSaveBondsAction::performCall() {
+ActionState::ptr MoleculeSaveBondsAction::performCall() {
   molecule *mol = NULL;
 
@@ -64 +64 @@
 }
 
-Action::state_ptr MoleculeSaveBondsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeSaveBondsAction::performUndo(ActionState::ptr _state) {
 //  MoleculeSaveBondsState *state = assert_cast<MoleculeSaveBondsState*>(_state.get());
 
@@ -73 +73 @@
 }
 
-Action::state_ptr MoleculeSaveBondsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeSaveBondsAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/SaveSelectedMoleculesAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeSaveSelectedMoleculesAction::performCall() {
+ActionState::ptr MoleculeSaveSelectedMoleculesAction::performCall() {
   LOG(1, "Storing selected molecules to file " << params.filename.get() << ".");
 
@@ -81 +81 @@
 }
 
-Action::state_ptr MoleculeSaveSelectedMoleculesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeSaveSelectedMoleculesAction::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 MoleculeSaveSelectedMoleculesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeSaveSelectedMoleculesAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 //  // Undo and redo have to do the same for this action

src/Actions/MoleculeAction/SaveTemperatureAction.cpp

@@ -56 +56 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeSaveTemperatureAction::performCall() {
+ActionState::ptr MoleculeSaveTemperatureAction::performCall() {
   LOG(1, "Storing temperatures in " << params.temperaturefile.get() << ".");
   ofstream output;
@@ -71 +71 @@
 }
 
-Action::state_ptr MoleculeSaveTemperatureAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeSaveTemperatureAction::performUndo(ActionState::ptr _state) {
 //  MoleculeSaveTemperatureState *state = assert_cast<MoleculeSaveTemperatureState*>(_state.get());
 
@@ -80 +80 @@
 }
 
-Action::state_ptr MoleculeSaveTemperatureAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeSaveTemperatureAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/StretchBondAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeStretchBondAction::performCall()
+ActionState::ptr MoleculeStretchBondAction::performCall()
 {
   // check preconditions
@@ -91 +91 @@
 
   MoleculeStretchBondState *UndoState = new MoleculeStretchBondState(shift, bondplane, mol, params);
-  return Action::state_ptr(UndoState);
+  return ActionState::ptr(UndoState);
 }
 
-Action::state_ptr MoleculeStretchBondAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeStretchBondAction::performUndo(ActionState::ptr _state) {
   MoleculeStretchBondState *state = assert_cast<MoleculeStretchBondState*>(_state.get());
 
@@ -112 +112 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr MoleculeStretchBondAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeStretchBondAction::performRedo(ActionState::ptr _state){
   MoleculeStretchBondState *state = assert_cast<MoleculeStretchBondState*>(_state.get());
 
@@ -132 +132 @@
     }
   }
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/MoleculeAction/SuspendInWaterAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeSuspendInWaterAction::performCall() {
+ActionState::ptr MoleculeSuspendInWaterAction::performCall() {
   molecule *mol = NULL;
   double volume = 0.;
@@ -68 +68 @@
 }
 
-Action::state_ptr MoleculeSuspendInWaterAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeSuspendInWaterAction::performUndo(ActionState::ptr _state) {
 //  MoleculeSuspendInWaterState *state = assert_cast<MoleculeSuspendInWaterState*>(_state.get());
 
@@ -77 +77 @@
 }
 
-Action::state_ptr MoleculeSuspendInWaterAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeSuspendInWaterAction::performRedo(ActionState::ptr _state){
   // Undo and redo have to do the same for this action
   return performUndo(_state);

src/Actions/MoleculeAction/VerletIntegrationAction.cpp

@@ -57 +57 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr MoleculeVerletIntegrationAction::performCall() {
+ActionState::ptr MoleculeVerletIntegrationAction::performCall() {
   // TODO: sollte besser stream nutzen, nicht filename direkt (es sei denn, ist prefix), besser fuer unit test
   AtomSetMixin<std::vector<atom *> > set(World::getInstance().getSelectedAtoms());
@@ -83 +83 @@
 }
 
-Action::state_ptr MoleculeVerletIntegrationAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr MoleculeVerletIntegrationAction::performUndo(ActionState::ptr _state) {
 //  MoleculeVerletIntegrationState *state = assert_cast<MoleculeVerletIntegrationState*>(_state.get());
 
@@ -92 +92 @@
 }
 
-Action::state_ptr MoleculeVerletIntegrationAction::performRedo(Action::state_ptr _state){
+ActionState::ptr MoleculeVerletIntegrationAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 }