Changeset b5b01e for src/Actions/ParserAction

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

Files:

• ParseTremoloPotentialsAction.cpp (modified) (3 diffs)
• SaveSelectedAtomsAsExtTypesAction.cpp (modified) (2 diffs)
• SetOutputFormatsAction.cpp (modified) (3 diffs)
• SetParserParametersAction.cpp (modified) (4 diffs)
• SetTremoloAtomdataAction.cpp (modified) (4 diffs)

src/Actions/ParserAction/ParseTremoloPotentialsAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ParserParseTremoloPotentialsAction::performCall() {
+ActionState::ptr ParserParseTremoloPotentialsAction::performCall() {
   boost::filesystem::ifstream test;
   FormatParser<tremolo> &parser = FormatParserStorage::getInstance().getParser<tremolo>();
@@ -74 +74 @@
 }
 
-Action::state_ptr ParserParseTremoloPotentialsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ParserParseTremoloPotentialsAction::performUndo(ActionState::ptr _state) {
 //  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
 
@@ -81 +81 @@
 //  state->mol->setName(state->lastName);
 //
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+//  return ActionState::ptr(new ParserLoadXyzState(state->mol,newName));
 }
 
-Action::state_ptr ParserParseTremoloPotentialsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ParserParseTremoloPotentialsAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 }

src/Actions/ParserAction/SaveSelectedAtomsAsExtTypesAction.cpp

@@ -54 +54 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ParserSaveSelectedAtomsAsExtTypesAction::performCall() {
+ActionState::ptr ParserSaveSelectedAtomsAsExtTypesAction::performCall() {
   if (boost::filesystem::exists(params.filename.get())) {
     ELOG(1, "Specified exttypes file " << params.filename.get() << " already exists.");
@@ -75 +75 @@
 }
 
-Action::state_ptr ParserSaveSelectedAtomsAsExtTypesAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ParserSaveSelectedAtomsAsExtTypesAction::performUndo(ActionState::ptr _state) {
   return Action::success;
 }
 
-Action::state_ptr ParserSaveSelectedAtomsAsExtTypesAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ParserSaveSelectedAtomsAsExtTypesAction::performRedo(ActionState::ptr _state){
   return Action::success;
 }

src/Actions/ParserAction/SetOutputFormatsAction.cpp

@@ -52 +52 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ParserSetOutputFormatsAction::performCall() {
+ActionState::ptr ParserSetOutputFormatsAction::performCall() {
   LOG(1, "Format list is: " << params.FormatList.get());
   for (vector<std::string>::const_iterator iter = params.FormatList.get().begin(); iter != params.FormatList.get().end(); ++iter) {
@@ -65 +65 @@
 }
 
-Action::state_ptr ParserSetOutputFormatsAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ParserSetOutputFormatsAction::performUndo(ActionState::ptr _state) {
 //  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
 
@@ -72 +72 @@
 //  state->mol->setName(state->lastName);
 //
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+//  return ActionState::ptr(new ParserLoadXyzState(state->mol,newName));
 }
 
-Action::state_ptr ParserSetOutputFormatsAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ParserSetOutputFormatsAction::performRedo(ActionState::ptr _state){
   return Action::failure;
 }

src/Actions/ParserAction/SetParserParametersAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ParserSetParserParametersAction::performCall() {
+ActionState::ptr ParserSetParserParametersAction::performCall() {
   // get parser
   ParserTypes type = FormatParserStorage::getInstance().getTypeFromName(params.parsername.get());
@@ -70 +70 @@
   newparamstream >> *parameters;
 
-  return Action::state_ptr(new ParserSetParserParametersState(oldparamstream.str(), params));
+  return ActionState::ptr(new ParserSetParserParametersState(oldparamstream.str(), params));
 }
 
-Action::state_ptr ParserSetParserParametersAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ParserSetParserParametersAction::performUndo(ActionState::ptr _state) {
   ParserSetParserParametersState *state = assert_cast<ParserSetParserParametersState*>(_state.get());
 
@@ -81 +81 @@
   oldparamstream >> *parser;
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ParserSetParserParametersAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ParserSetParserParametersAction::performRedo(ActionState::ptr _state){
   ParserSetParserParametersState *state = assert_cast<ParserSetParserParametersState*>(_state.get());
 
@@ -94 +94 @@
   newparamstream >> *parser;
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 

src/Actions/ParserAction/SetTremoloAtomdataAction.cpp

@@ -53 +53 @@
 #include "Action_impl_pre.hpp"
 /** =========== define the function ====================== */
-Action::state_ptr ParserSetTremoloAtomdataAction::performCall() {
+ActionState::ptr ParserSetTremoloAtomdataAction::performCall() {
   FormatParser<tremolo> &parser = FormatParserStorage::getInstance().getParser<tremolo>();
 
@@ -65 +65 @@
     parser.setAtomData(params.atomdata_string.get());
 
-  return Action::state_ptr(new ParserSetTremoloAtomdataState(old_atomdata, params));
+  return ActionState::ptr(new ParserSetTremoloAtomdataState(old_atomdata, params));
 }
 
-Action::state_ptr ParserSetTremoloAtomdataAction::performUndo(Action::state_ptr _state) {
+ActionState::ptr ParserSetTremoloAtomdataAction::performUndo(ActionState::ptr _state) {
   ParserSetTremoloAtomdataState *state = assert_cast<ParserSetTremoloAtomdataState*>(_state.get());
 
@@ -75 +75 @@
   parser.resetAtomData(state->old_atomdata);
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }
 
-Action::state_ptr ParserSetTremoloAtomdataAction::performRedo(Action::state_ptr _state){
+ActionState::ptr ParserSetTremoloAtomdataAction::performRedo(ActionState::ptr _state){
   ParserSetTremoloAtomdataState *state = assert_cast<ParserSetTremoloAtomdataState*>(_state.get());
 
@@ -88 +88 @@
     parser.setAtomData(state->params.atomdata_string.get());
 
-  return Action::state_ptr(_state);
+  return ActionState::ptr(_state);
 }