Changeset 12d946 for src

Timestamp:

Sep 19, 2013, 8:23:53 PM (11 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:

25e18e7

Parents:

7e3f11a

git-author:

Frederik Heber <heber@…> (08/26/13 15:00:46)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:53)

Message:

Implemented LoadSessionAction.

• this it also used in builder_init.cpp.
• added load-session to tokens not stored in ActionQueue::outputAs...().
• added regression test which loads a stored action and stores again to compare the two scripts.

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (2 diffs)
• CommandAction/LoadSessionAction.cpp (added)
• CommandAction/LoadSessionAction.def (added)
• CommandAction/LoadSessionAction.hpp (added)
• GlobalListOfActions.hpp (modified) (1 diff)
• Makefile.am (modified) (3 diffs)

src/Actions/ActionQueue.cpp

@@ -97 +97 @@
       ++iter) {
     // skip store-session in printed list
-    if ((*iter)->getName() != std::string("store-session")) {
+    if ( ((*iter)->getName() != std::string("store-session"))
+        && ((*iter)->getName() != std::string("load-session"))) {
       if (iter != queue.begin())
         output << " ";
@@ -115 +116 @@
       ++iter) {
     // skip store-session in printed list
-    if ((*iter)->getName() != std::string("store-session"))
+    if ( ((*iter)->getName() != std::string("store-session"))
+        && ((*iter)->getName() != std::string("load-session")))
       (*iter)->outputAsPython(output, prefix);
   }

src/Actions/GlobalListOfActions.hpp

@@ -48 +48 @@
   (CommandHelp) \
   (CommandHelpRedistribute) \
+  (CommandLoadSession) \
   (CommandSetRandomNumbersEngine) \
   (CommandSetRandomNumbersDistribution) \

src/Actions/Makefile.am

@@ -190 +190 @@
   Actions/CommandAction/HelpAction.cpp \
   Actions/CommandAction/HelpRedistributeAction.cpp \
+  Actions/CommandAction/LoadSessionAction.cpp \
   Actions/CommandAction/StoreSessionAction.cpp \
   Actions/CommandAction/VerboseAction.cpp \
@@ -200 +201 @@
   Actions/CommandAction/HelpAction.hpp \
   Actions/CommandAction/HelpRedistributeAction.hpp \
+  Actions/CommandAction/LoadSessionAction.hpp \
   Actions/CommandAction/StoreSessionAction.hpp \
   Actions/CommandAction/VerboseAction.hpp \
@@ -210 +212 @@
   Actions/CommandAction/HelpAction.def \
   Actions/CommandAction/HelpRedistributeAction.def \
+  Actions/CommandAction/LoadSessionAction.def \
   Actions/CommandAction/StoreSessionAction.def \
   Actions/CommandAction/VerboseAction.def \