Changeset b5b01e for src/Actions/MoleculeAction/LoadAction.cpp

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.

File:

• src/Actions/MoleculeAction/LoadAction.cpp (modified) (5 diffs)

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)
   );