Changeset b5b01e for src/Actions/CommandAction

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

Files:

• BondLengthTableAction.cpp (modified) (5 diffs)
• ElementDbAction.cpp (modified) (5 diffs)
• FastParsingAction.cpp (modified) (4 diffs)
• HelpAction.cpp (modified) (2 diffs)
• HelpRedistributeAction.cpp (modified) (2 diffs)
• VerboseAction.cpp (modified) (5 diffs)
• VersionAction.cpp (modified) (1 diff)
• WarrantyAction.cpp (modified) (2 diffs)

src/Actions/CommandAction/BondLengthTableAction.cpp

@@ -55 +55 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandBondLengthTableAction::performCall() {
+ActionState::ptr CommandBondLengthTableAction::performCall() {
   ostringstream usage;
 
@@ -78 +78 @@
       LOG(0, "Bond length table parsed successfully.");
       input.close();
-      return Action::state_ptr(UndoState);
+      return ActionState::ptr(UndoState);
     } else {
       ELOG(1, "Bond length table parsing failed.");
@@ -94 +94 @@
 }
 
-Action::state_ptr CommandBondLengthTableAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandBondLengthTableAction::performUndo(ActionState::ptr _state) {
   CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get());
 
@@ -103 +103 @@
   World::getInstance().setBondGraph(BG);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr CommandBondLengthTableAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandBondLengthTableAction::performRedo(ActionState::ptr _state){
   CommandBondLengthTableState *state = assert_cast<CommandBondLengthTableState*>(_state.get());
 
@@ -117 +117 @@
   }
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/CommandAction/ElementDbAction.cpp

@@ -57 +57 @@
 
 /** =========== define the function ====================== */
-Action::state_ptr CommandElementDbAction::performCall() {
+ActionState::ptr CommandElementDbAction::performCall() {
   std::ostringstream usage;
 
@@ -82 +82 @@
     LOG(0, "Element list loaded successfully.");
     //periode->Output();
-    return Action::state_ptr(UndoState);
+    return ActionState::ptr(UndoState);
   } else {
     LOG(0, "Element list loading failed.");
@@ -90 +90 @@
 }
 
-Action::state_ptr CommandElementDbAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandElementDbAction::performUndo(ActionState::ptr _state) {
   CommandElementDbState *state = assert_cast<CommandElementDbState*>(_state.get());
 
@@ -102 +102 @@
   World::getInstance().getPeriode() = periode;
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr CommandElementDbAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandElementDbAction::performRedo(ActionState::ptr _state){
   CommandElementDbState *state = assert_cast<CommandElementDbState*>(_state.get());
 
@@ -119 +119 @@
     LOG(0, "Element list loaded successfully.");
     //periode->Output();
-    return Action::state_ptr(_state);
+    return ActionState::ptr(_state);
   } else {
     LOG(0, "Element list loading failed.");

src/Actions/CommandAction/FastParsingAction.cpp

@@ -51 +51 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandFastParsingAction::performCall() {
+ActionState::ptr CommandFastParsingAction::performCall() {
   config *configuration = World::getInstance().getConfig();
   bool oldvalue = configuration->FastParsing;
@@ -60 +60 @@
   else
     LOG(0, "I will parse trajectories.");
-  return Action::state_ptr(new CommandFastParsingState(oldvalue, params));
+  return ActionState::ptr(new CommandFastParsingState(oldvalue, params));
 }
 
-Action::state_ptr CommandFastParsingAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandFastParsingAction::performUndo(ActionState::ptr _state) {
   CommandFastParsingState *state = assert_cast<CommandFastParsingState*>(_state.get());
 
@@ -73 +73 @@
     LOG(0, "I will parse trajectories.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr CommandFastParsingAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandFastParsingAction::performRedo(ActionState::ptr _state){
   CommandFastParsingState *state = assert_cast<CommandFastParsingState*>(_state.get());
 
@@ -86 +86 @@
     LOG(0, "I will parse trajectories.");
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/CommandAction/HelpAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandHelpAction::performCall() {
+ActionState::ptr CommandHelpAction::performCall() {
   // print some general advice
   std::cout << std::endl << std::endl << "Usage help:" << std::endl;
@@ -107 +107 @@
 }
 
-Action::state_ptr CommandHelpAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandHelpAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr CommandHelpAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandHelpAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/CommandAction/HelpRedistributeAction.cpp

@@ -50 +50 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandHelpRedistributeAction::performCall() {
+ActionState::ptr CommandHelpRedistributeAction::performCall() {
   // print some general advice
 
@@ -73 +73 @@
 }
 
-Action::state_ptr CommandHelpRedistributeAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandHelpRedistributeAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr CommandHelpRedistributeAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandHelpRedistributeAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/CommandAction/VerboseAction.cpp

@@ -49 +49 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandVerboseAction::performCall() {
+ActionState::ptr CommandVerboseAction::performCall() {
   unsigned int oldverbosity = getVerbosity();
 
@@ -58 +58 @@
     setVerbosity(params.verbosity.get());
     LOG(0, "Setting verbosity from " << oldverbosity << " to " << params.verbosity.get() << ".");
-    return Action::state_ptr(UndoState);
+    return ActionState::ptr(UndoState);
   } else {
     LOG(0, "Verbosity remains unchanged at " << oldverbosity << ".");
@@ -65 +65 @@
 }
 
-Action::state_ptr CommandVerboseAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandVerboseAction::performUndo(ActionState::ptr _state) {
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
@@ -71 +71 @@
   setVerbosity(state->oldverbosity);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr CommandVerboseAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandVerboseAction::performRedo(ActionState::ptr _state){
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
@@ -80 +80 @@
   setVerbosity(state->params.verbosity.get());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/CommandAction/VersionAction.cpp

@@ -48 +48 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandVersionAction::performCall() {
+ActionState::ptr CommandVersionAction::performCall() {
   return Action::success;
 }
 
-Action::state_ptr CommandVersionAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandVersionAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr CommandVersionAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandVersionAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/CommandAction/WarrantyAction.cpp

@@ -46 +46 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr CommandWarrantyAction::performCall() {
+ActionState::ptr CommandWarrantyAction::performCall() {
   std::cout << std::endl;
   std::cout << "This program is distributed in the hope that it will be useful," << std::endl;
@@ -56 +56 @@
 }
 
-Action::state_ptr CommandWarrantyAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr CommandWarrantyAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr CommandWarrantyAction::performRedo(Action::state_ptr _state){
+ActionState::ptr CommandWarrantyAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }