Changeset 014bc4 for src/controller_SystemCommandJob.cpp

Timestamp:

Jul 6, 2012, 10:18:46 AM (13 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, Candidate_v1.7.0, 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:

fd4d5e

Parents:

cbcbbd

git-author:

Frederik Heber <heber@…> (06/02/12 10:51:09)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:46)

Message:

Introduced interface controller_AddOn.hpp that encapsulates controller extending functions in struct controller_AddOn.

• allocating function for derived structure controller_AddOn is contained in extra module to allow indepent linking, i.e. combine controller.cpp, controller_AddOn_SystemCommandJob.cpp and controller_SystemCommandJon.cpp or with controller_AddOn_MPQCCommandJob.cpp and controller_MPQCCommandJon.cpp.

File:

• src/controller_SystemCommandJob.cpp (modified) (3 diffs)

src/controller_SystemCommandJob.cpp

@@ -64 +64 @@
 }
 
-ControllerOptions *allocateControllerInfo()
+inline std::vector<std::string> getListOfCommands(const ControllerCommandRegistry &ControllerCommands)
+{
+  std::vector<std::string> Commands;
+  for (ControllerCommandRegistry::const_iterator iter = ControllerCommands.getBeginIter();
+      iter != ControllerCommands.getEndIter(); ++iter)
+    Commands.push_back(iter->first);
+
+  return Commands;
+}
+
+ControllerOptions *controller_SystemCommandJob::allocateControllerInfo()
 {
   return new ControllerOptions_SystemCommandJob();
 }
 
-void addSpecificCommands(
+void controller_SystemCommandJob::addSpecificCommands(
     boost::function<void (ControllerCommand *)> &registrator,
     FragmentController &controller,
-    ControllerOptions &ControllerInfo,
-    boost::program_options::variables_map &vm)
+    ControllerOptions &ControllerInfo)
 {
   ControllerOptions_SystemCommandJob &CI =
@@ -92 +101 @@
 }
 
-void addSpecificOptions(
+void controller_SystemCommandJob::addSpecificOption(
     boost::program_options::options_description_easy_init option)
 {
@@ -101 +110 @@
 }
 
-int addOtherParsings(
+int controller_SystemCommandJob::addOtherParsings(
     ControllerOptions &ControllerInfo,
-    boost::program_options::variables_map &vm,
-    const ControllerCommandRegistry &ControllerCommands)
+    boost::program_options::variables_map &vm)
 {
   ControllerOptions_SystemCommandJob &CI =