Changeset b5b01e for src/Actions/FragmentationAction

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

Files:

• AnalyseFragmentationResultsAction.cpp (modified) (2 diffs)
• FragmentationAction.cpp (modified) (2 diffs)
• FragmentationAutomationAction.cpp (modified) (2 diffs)
• MolecularDynamicsAction.cpp (modified) (2 diffs)
• MolecularDynamicsAction.hpp (modified) (1 diff)
• ParseFragmentJobsAction.cpp (modified) (2 diffs)
• StoreSaturatedFragmentAction.cpp (modified) (2 diffs)

src/Actions/FragmentationAction/AnalyseFragmentationResultsAction.cpp

@@ -324 +324 @@
 }
 
-Action::state_ptr FragmentationAnalyseFragmentationResultsAction::performCall() {
+ActionState::ptr FragmentationAnalyseFragmentationResultsAction::performCall() {
 
   // if file is given, parse from file into resultscontainer
@@ -431 +431 @@
 }
 
-Action::state_ptr FragmentationAnalyseFragmentationResultsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FragmentationAnalyseFragmentationResultsAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr FragmentationAnalyseFragmentationResultsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr FragmentationAnalyseFragmentationResultsAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -71 +71 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FragmentationFragmentationAction::performCall() {
+ActionState::ptr FragmentationFragmentationAction::performCall() {
   clock_t start,end;
   int ExitFlag = -1;
@@ -242 +242 @@
 }
 
-Action::state_ptr FragmentationFragmentationAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FragmentationFragmentationAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr FragmentationFragmentationAction::performRedo(Action::state_ptr _state){
+ActionState::ptr FragmentationFragmentationAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -97 +97 @@
 }
 
-Action::state_ptr FragmentationFragmentationAutomationAction::performCall() {
+ActionState::ptr FragmentationFragmentationAutomationAction::performCall() {
   boost::asio::io_service io_service;
 
@@ -272 +272 @@
 }
 
-Action::state_ptr FragmentationFragmentationAutomationAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FragmentationFragmentationAutomationAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr FragmentationFragmentationAutomationAction::performRedo(Action::state_ptr _state){
+ActionState::ptr FragmentationFragmentationAutomationAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/FragmentationAction/MolecularDynamicsAction.cpp

@@ -69 +69 @@
 }
 
-Action::state_ptr FragmentationMolecularDynamicsAction::performCall(){
+ActionState::ptr FragmentationMolecularDynamicsAction::performCall(){
   // now we can truely prepare
   ActionQueue &AQ = ActionQueue::getInstance();
@@ -84 +84 @@
   isPrepared = true;
 
-  Action::state_ptr state(MakroAction::performCall());
+  ActionState::ptr state(MakroAction::performCall());
 
   return state;
 }
 
-Action::state_ptr FragmentationMolecularDynamicsAction::performUndo(Action::state_ptr _state) {
-  Action::state_ptr state(MakroAction::performUndo(_state));
+ActionState::ptr FragmentationMolecularDynamicsAction::performUndo(ActionState::ptr _state) {
+  ActionState::ptr state(MakroAction::performUndo(_state));
 
   return state;
 }
 
-Action::state_ptr FragmentationMolecularDynamicsAction::performRedo(Action::state_ptr _state){
-  Action::state_ptr state(MakroAction::performRedo(_state));
+ActionState::ptr FragmentationMolecularDynamicsAction::performRedo(ActionState::ptr _state){
+  ActionState::ptr state(MakroAction::performRedo(_state));
 
   return state;

src/Actions/FragmentationAction/MolecularDynamicsAction.hpp

@@ -99 +99 @@
 //  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/FragmentationAction/ParseFragmentJobsAction.cpp

@@ -50 +50 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FragmentationParseFragmentJobsAction::performCall() {
+ActionState::ptr FragmentationParseFragmentJobsAction::performCall() {
   // check for present jobs
   if (params.jobfiles.get().empty()) {
@@ -72 +72 @@
 }
 
-Action::state_ptr FragmentationParseFragmentJobsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FragmentationParseFragmentJobsAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr FragmentationParseFragmentJobsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr FragmentationParseFragmentJobsAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/FragmentationAction/StoreSaturatedFragmentAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr FragmentationStoreSaturatedFragmentAction::performCall() {
+ActionState::ptr FragmentationStoreSaturatedFragmentAction::performCall() {
   World &world = World::getInstance();
 
@@ -87 +87 @@
 }
 
-Action::state_ptr FragmentationStoreSaturatedFragmentAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr FragmentationStoreSaturatedFragmentAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr FragmentationStoreSaturatedFragmentAction::performRedo(Action::state_ptr _state){
+ActionState::ptr FragmentationStoreSaturatedFragmentAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }