Changeset 5fa1f0

Timestamp:

Jul 6, 2012, 10:18:44 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, 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:

6c52d2

Parents:

0aaf84

git-author:

Frederik Heber <heber@…> (06/01/12 16:45:25)

git-committer:

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

Message:

Outsourced DefaultOptions, ControllerOptions, ControllerOptions_SystemCommandJob, and ControllerOptions_MPQCCommandJob, into own modules.

Location:

src

Files:

• ControllerOptions.cpp (added)
• ControllerOptions.hpp (added)
• ControllerOptions_MPQCCommandJob.cpp (added)
• ControllerOptions_MPQCCommandJob.hpp (added)
• ControllerOptions_SystemCommandJob.cpp (added)
• ControllerOptions_SystemCommandJob.hpp (added)
• DefaultOptions.cpp (added)
• DefaultOptions.hpp (added)
• Makefile.am (modified) (1 diff)
• controller.cpp (modified) (3 diffs)

src/Makefile.am

@@ -381 +381 @@
   Fragmentation/Automation/Pool/WorkerPool.hpp
 
-Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp
-Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp DefaultOptions.cpp DefaultOptions.hpp ControllerOptions.cpp ControllerOptions.hpp ControllerOptions_MPQCCommandJob.cpp ControllerOptions_MPQCCommandJob.hpp ControllerOptions_SystemCommandJob.cpp ControllerOptions_SystemCommandJob.hpp
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM__OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
 Controller_CXXFLAGS = $(AM_CPPFLAGS)
 Controller_LDADD = \

src/controller.cpp

@@ -49 +49 @@
 #include "Fragmentation/Automation/Jobs/SystemCommandJob.hpp"
 #include "Fragmentation/Automation/Results/FragmentResult.hpp"
+#include "ControllerOptions_MPQCCommandJob.hpp"
 
 /** Print the status of scheduled and done jobs.
@@ -287 +288 @@
 }
 
-struct DefaultOptions
-{
-  int parseHelp(boost::program_options::variables_map &vm, const boost::program_options::options_description &desc) {
-    if (vm.count("help")) {
-      std::cout << desc << "\n";
-      return 1;
-    }
-    return 0;
-  }
-  int parseVerbosity(boost::program_options::variables_map &vm) {
-    if (vm.count("verbosity")) {
-      LOG(0, "STATUS: Verbosity level was set to " << vm["verbosity"].as<size_t>() << ".");
-      setVerbosity(vm["verbosity"].as<size_t>());
-    } else {
-      LOG(0, "STATUS: Verbosity level was not set, defaulting to 5.");
-      setVerbosity(5);
-    }
-    return 0;
-  }
-};
-
-struct ControllerOptions : public DefaultOptions
-{
-  int parseServerPort(boost::program_options::variables_map &vm) {
-    if (vm.count("server")) {
-      server = vm["server"].as< std::string >();
-      serverport = server.substr(server.find_last_of(':')+1, std::string::npos);
-      server = server.substr(0, server.find_last_of(':'));
-      try {
-        boost::lexical_cast<size_t>(serverport);
-      } catch (boost::bad_lexical_cast &) {
-        ELOG(1, "Could not interpret " << serverport << " as server:port.");
-        return 255;
-      }
-      LOG(1, "INFO: Using " << server << ":" << serverport << " as server's address.");
-    } else {
-      ELOG(1, "Requiring server's address (host:port) to connect to.");
-      return 255;
-    }
-    return 0;
-  }
-
-  int parseCommand(boost::program_options::variables_map &vm, const std::vector<std::string> &Commands) {
-    if (!vm.count("command")) {
-      ELOG(1, "Controller requires one of the following commands: "+toString(Commands));
-      return 255;
-    }
-    command = vm["command"].as< std::string >();
-    return 0;
-  }
-
-  std::string command;
-  std::string server;
-  std::string serverport;
-
-};
-
-struct ControllerOptions_SystemCommandJob : public ControllerOptions
-{
-  int parseExecutable(boost::program_options::variables_map &vm) {
-    if ((command == "createjobs") || (command == "addjobs")) {
-      if (!vm.count("executable")) {
-        ELOG(1, "'"+command+"' requires two options: [executable] [jobcommand].");
-        return 255;
-      }
-      executable = vm["executable"].as< std::string >();
-    }
-    return 0;
-  }
-
-  int parseJobCommand(boost::program_options::variables_map &vm) {
-    if (command == "createjobs") {
-      if (!vm.count("jobcommand")) {
-        ELOG(1, "'"+command+"' requires two options: [executable] [jobcommand].");
-        return 255;
-      }
-      jobcommand = vm["jobcommand"].as< std::string >();
-    }
-    return 0;
-  }
-
-  std::string executable;
-  std::string jobcommand;
-};
-
-struct ControllerOptions_MPQCCommandJob : public ControllerOptions_SystemCommandJob
-{
-  int parseFragmentpath(boost::program_options::variables_map &vm) {
-    if (command == "receivempqc") {
-      if (!vm.count("fragment-path")) {
-        ELOG(1, "'"+command+"' requires two options: [fragment-path].");
-        return 255;
-      }
-      fragmentpath = vm["fragment-path"].as< std::string >();
-    }
-    return 0;
-  }
-
-  int parseJobfiles(boost::program_options::variables_map &vm) {
-    if (command == "addjobs") {
-      if (!vm.count("jobfiles")) {
-        ELOG(1, "'"+command+"' requires two options: [executable] [jobfiles].");
-        return 255;
-      }
-      jobfiles = vm["jobfiles"].as< std::vector<std::string> >();
-    }
-    return 0;
-  }
-
-  std::string fragmentpath;
-  std::vector<std::string> jobfiles;
-};
-
 void creatingJob(FragmentController &controller, const ControllerOptions_SystemCommandJob &ControllerInfo)
 {
@@ -517 +405 @@
 
   // set controller information
-  ControllerInfo.parseHelp(vm, desc);
-  ControllerInfo.parseVerbosity(vm);
-  ControllerInfo.parseServerPort(vm);
-  ControllerInfo.parseCommand(vm, Commands);
+  int status = 0;
+  status = ControllerInfo.parseHelp(vm, desc);
+  if (status) return status;
+  status = ControllerInfo.parseVerbosity(vm);
+  if (status) return status;
+  status = ControllerInfo.parseServerPort(vm);
+  if (status) return status;
+  status = ControllerInfo.parseCommand(vm, Commands);
+  if (status) return status;
 
   // all later parse functions depend on parsed command
-  ControllerInfo.parseExecutable(vm);
-
-  ControllerInfo.parseJobCommand(vm);
-
-  ControllerInfo.parseFragmentpath(vm);
-
-  ControllerInfo.parseJobfiles(vm);
+  status = ControllerInfo.parseExecutable(vm);
+  if (status) return status;
+  status = ControllerInfo.parseJobCommand(vm);
+  if (status) return status;
+  status = ControllerInfo.parseFragmentpath(vm);
+  if (status) return status;
+  status = ControllerInfo.parseJobfiles(vm);
+  if (status) return status;
 
   // parse given ControllerCommand