Changeset 685e28

Timestamp:

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

0aaf84

Parents:

9dcce3

git-author:

Frederik Heber <heber@…> (05/31/12 09:08:05)

git-committer:

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

Message:

Removed the lot of switch statements in controller's main(), replaced by deque's of bound functions.

• This will eventually allow the use to simply add another command by furnishing it with its own queue of bound functions.

File:

• src/controller.cpp (modified) (8 diffs)

src/controller.cpp

@@ -27 +27 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
+#include <boost/assign.hpp>
 #include <boost/program_options.hpp>
+#include <deque>
 #include <fstream>
 #include <iostream>
@@ -50 +50 @@
 #include "Fragmentation/Automation/Results/FragmentResult.hpp"
 
-enum CommandIndices {
-  UnknownCommandIndex = 0,
-  AddJobsIndex = 1,
-  CreateJobsIndex = 2,
-  CheckResultsIndex = 3,
-  ReceiveResultsIndex = 4,
-  ReceiveMPQCIndex = 5,
-  RemoveAllIndex = 6,
-  ShutdownIndex = 7,
-};
-
+/** Print the status of scheduled and done jobs.
+ *
+ * @param status pair of number of schedule and done jobs
+ */
+void printJobStatus(const std::pair<size_t, size_t> &JobStatus)
+{
+  LOG(1, "INFO: #" << JobStatus.first << " are waiting in the queue and #"
+      << JobStatus.second << " jobs are calculated so far.");
+}
 
 /** Creates a SystemCommandJob out of give \a command with \a argument.
@@ -75 +73 @@
     const JobId_t nextid)
 {
-
   FragmentJob::ptr testJob( new SystemCommandJob(command, argument, nextid) );
   jobs.push_back(testJob);
@@ -109 +106 @@
  * @param results received results to print
  */
-void printReceivedResults(std::vector<FragmentResult::ptr> &results)
+void printReceivedResults(const std::vector<FragmentResult::ptr> &results)
 {
   for (std::vector<FragmentResult::ptr>::const_iterator iter = results.begin();
@@ -290 +287 @@
 }
 
-
-/** Returns a unique index for every command to allow switching over it.
- *
- * \param &commandmap map with command strings
- * \param &cmd command string
- * \return index from CommandIndices: UnkownCommandIndex - unknown command, else - command index
- */
-CommandIndices getCommandIndex(std::map<std::string, CommandIndices> &commandmap, const std::string &cmd)
-{
-  std::map<std::string, CommandIndices>::const_iterator iter = commandmap.find(cmd);
-  if (iter != commandmap.end())
-    return iter->second;
-  else
-    return UnknownCommandIndex;
-}
-
 struct ControllerOptions
 {
+
   int parseHelp(boost::program_options::variables_map &vm, const boost::program_options::options_description &desc) {
     if (vm.count("help")) {
@@ -388 +370 @@
 };
 
+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)
+{
+  const JobId_t next_id = controller.getAvailableId();
+  std::vector<FragmentJob::ptr> jobs;
+  createjobs(jobs, ControllerInfo.executable, ControllerInfo.jobcommand, next_id);
+  controller.addJobs(jobs);
+  controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
+}
+
+/** Creates a MPQCCommandJob out of give \a command with \a argument.
+ *
+ * @param controller reference to controller to add jobs
+ * @param ControllerInfo information on the job
+ */
+void AddJobs(FragmentController &controller, const ControllerOptions_MPQCCommandJob &ControllerInfo)
+{
+  std::vector<FragmentJob::ptr> jobs;
+  for (std::vector< std::string >::const_iterator iter = ControllerInfo.jobfiles.begin();
+      iter != ControllerInfo.jobfiles.end(); ++iter) {
+    const JobId_t next_id = controller.getAvailableId();
+    const std::string &filename = *iter;
+    LOG(1, "INFO: Creating MPQCCommandJob with filename '"
+        +filename+"', and id "+toString(next_id)+".");
+    parsejob(jobs, ControllerInfo.executable, filename, next_id);
+  }
+  controller.addJobs(jobs);
+  controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
+}
+
 int main(int argc, char* argv[])
 {
@@ -394 +433 @@
   atexit(cleanUp);
 
-  setVerbosity(3);
-
   size_t Exitflag = 0;
-  typedef std::map<std::string, CommandIndices> CommandsMap_t;
+
+  ControllerOptions_MPQCCommandJob ControllerInfo;
+  boost::asio::io_service io_service;
+  FragmentController controller(io_service);
+  boost::program_options::variables_map vm;
+
+  typedef boost::function<void ()> ControllerCommand;
+  typedef std::map<std::string, std::deque<ControllerCommand> > CommandsMap_t;
   CommandsMap_t CommandsMap;
-  CommandsMap.insert( std::make_pair("addjobs", AddJobsIndex) );
-  CommandsMap.insert( std::make_pair("createjobs", CreateJobsIndex) );
-  CommandsMap.insert( std::make_pair("checkresults", CheckResultsIndex) );
-  CommandsMap.insert( std::make_pair("receiveresults", ReceiveResultsIndex) );
-  CommandsMap.insert( std::make_pair("receivempqc", ReceiveMPQCIndex) );
-  CommandsMap.insert( std::make_pair("removeall", RemoveAllIndex) );
-  CommandsMap.insert( std::make_pair("shutdown", ShutdownIndex) );
+
+  // prepare the command queues for each ControllerCommand
+  // note: we need "< ControllerCommand >" because parseExecutable(),... return int
+  // in contrast to other functions that return void
+  std::deque<ControllerCommand> addjobsQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::requestIds,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport),
+          boost::bind(&std::vector<std::string>::size, boost::cref(ControllerInfo.jobfiles))))
+      (boost::bind(&AddJobs, boost::ref(controller), boost::cref(ControllerInfo)))
+      ;
+  std::deque<ControllerCommand> createjobsQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::requestIds,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport), 1))
+      (boost::bind(&creatingJob, boost::ref(controller), boost::cref(ControllerInfo)))
+      ;
+  std::deque<ControllerCommand> checkresultsQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::checkResults,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      (boost::bind(&printJobStatus,
+          boost::bind(&FragmentController::getJobStatus, boost::ref(controller))))
+      ;
+  std::deque<ControllerCommand> receiveresultsQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::receiveResults,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      (boost::bind(&printReceivedResults,
+          boost::bind(&FragmentController::getReceivedResults, boost::ref(controller))))
+      ;
+  std::deque<ControllerCommand> receivempqcresultsQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::receiveResults,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      (boost::bind(&printReceivedMPQCResults,
+          boost::bind(&FragmentController::getReceivedResults, boost::ref(controller)),
+          boost::cref(ControllerInfo.fragmentpath),
+          boost::bind(&getNoAtomsFromAdjacencyFile, boost::cref(ControllerInfo.fragmentpath))))
+      ;
+  std::deque<ControllerCommand> removeallQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::removeall,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      ;
+  std::deque<ControllerCommand> shutdownQueue = boost::assign::list_of< ControllerCommand >
+      (boost::bind(&FragmentController::shutdown,
+          boost::ref(controller), boost::cref(ControllerInfo.server), boost::cref(ControllerInfo.serverport)))
+      ;
+  CommandsMap.insert( std::make_pair("addjobs", addjobsQueue) );
+  CommandsMap.insert( std::make_pair("createjobs", createjobsQueue) );
+  CommandsMap.insert( std::make_pair("checkresults", checkresultsQueue) );
+  CommandsMap.insert( std::make_pair("receiveresults", receiveresultsQueue) );
+  CommandsMap.insert( std::make_pair("receivempqc", receivempqcresultsQueue) );
+  CommandsMap.insert( std::make_pair("removeall", removeallQueue) );
+  CommandsMap.insert( std::make_pair("shutdown", shutdownQueue) );
   std::vector<std::string> Commands;
   for (CommandsMap_t::const_iterator iter = CommandsMap.begin(); iter != CommandsMap.end(); ++iter)
@@ -418 +505 @@
       ("command", boost::program_options::value< std::string >(), (std::string("command to send to server: ")+toString(Commands)).c_str())
       ("executable", boost::program_options::value< std::string >(), "executable for commands 'addjobs' and 'createjobs'")
-      ("fragment-path", boost::program_options::value< std::string >(), "path to fragment files for 'receivempqcresults'")
+      ("fragment-path", boost::program_options::value< std::string >(), "path to fragment files for 'receivempqc'")
       ("jobcommand", boost::program_options::value< std::string >(), "command argument for executable for 'createjobs'")
       ("jobfiles", boost::program_options::value< std::vector< std::string > >()->multitoken(), "list of files as single argument to executable for 'addjobs'")
   ;
 
-  boost::program_options::variables_map vm;
+  // parse command line
   boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
   boost::program_options::notify(vm);
-  ControllerOptions_SystemCommandJob ControllerInfo;
-
+
+  // set controller information
   ControllerInfo.parseHelp(vm, desc);
-
   ControllerInfo.parseVerbosity(vm);
-
   ControllerInfo.parseServerPort(vm);
-
   ControllerInfo.parseCommand(vm, Commands);
-  const CommandIndices commandIndex = getCommandIndex(CommandsMap, ControllerInfo.command);
-
+
+  // all later parse functions depend on parsed command
   ControllerInfo.parseExecutable(vm);
 
   ControllerInfo.parseJobCommand(vm);
 
-  // check arguments
-  switch(commandIndex) {
-    case AddJobsIndex:
-    case CreateJobsIndex:
-      break;
-    case CheckResultsIndex:
-      break;
-    case ReceiveResultsIndex:
-      break;
-    case ReceiveMPQCIndex:
-      if (!vm.count("fragment-path")) {
-        ELOG(1, "'"+ControllerInfo.command+"' require one option: [path to fragment files].");
-        return 255;
-      }
-      break;
-    case RemoveAllIndex:
-      break;
-    case ShutdownIndex:
-      break;
-    case UnknownCommandIndex:
-    default:
-      ELOG(1, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
-      return 255;
-      break;
-  }
-
+  ControllerInfo.parseFragmentpath(vm);
+
+  ControllerInfo.parseJobfiles(vm);
+
+  // parse given ControllerCommand
+  if( CommandsMap.count(ControllerInfo.command) == 0) {
+    ELOG(1, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
+    return 255;
+  }
+  std::deque<ControllerCommand> &commands = CommandsMap[ControllerInfo.command];
   try
   {
-
-    boost::asio::io_service io_service;
-    FragmentController controller(io_service);
-
-    // Initial phase: information gathering from server
-
-    switch(commandIndex) {
-      case AddJobsIndex:
-        controller.requestIds(ControllerInfo.server, ControllerInfo.serverport, vm["jobfiles"].as< std::vector<std::string> >().size());
-        break;
-      case CreateJobsIndex:
-        controller.requestIds(ControllerInfo.server, ControllerInfo.serverport, 1);
-        break;
-      case CheckResultsIndex:
-        break;
-      case ReceiveResultsIndex:
-        break;
-      case ReceiveMPQCIndex:
-        break;
-      case RemoveAllIndex:
-        break;
-      case ShutdownIndex:
-        break;
-      case UnknownCommandIndex:
-      default:
-        ELOG(0, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
-        return 255;
-        break;
-    }
-
-    {
-      io_service.reset();
-      Info info("io_service: Phase One");
-      io_service.run();
-    }
-
-    // Second phase: Building jobs and sending information to server
-
-    switch(commandIndex) {
-      case AddJobsIndex:
+    // execute each command in the queue synchronously
+    size_t phase = 1;
+    while (!commands.empty()) {
+      ControllerCommand command = commands.front();
+      commands.pop_front();
+      command();
       {
-        std::vector<FragmentJob::ptr> jobs;
-        const std::string executable(vm["executable"].as< std::string >());
-        const std::vector< std::string > jobfiles = vm["jobfiles"].as< std::vector< std::string > >();
-        for (std::vector< std::string >::const_iterator iter = jobfiles.begin();
-            iter != jobfiles.end(); ++iter) {
-          const JobId_t next_id = controller.getAvailableId();
-          const std::string &filename = *iter;
-          LOG(1, "INFO: Creating MPQCCommandJob with filename'"
-              +filename+"', and id "+toString(next_id)+".");
-          parsejob(jobs, executable, filename, next_id);
-        }
-        controller.addJobs(jobs);
-        controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      }
-      case CreateJobsIndex:
-      {
-        const JobId_t next_id = controller.getAvailableId();
-        std::vector<FragmentJob::ptr> jobs;
-        createjobs(jobs, ControllerInfo.executable, ControllerInfo.jobcommand, next_id);
-        controller.addJobs(jobs);
-        controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      }
-      case CheckResultsIndex:
-        controller.checkResults(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      case ReceiveResultsIndex:
-      case ReceiveMPQCIndex:
-        controller.receiveResults(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      case RemoveAllIndex:
-        controller.removeall(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      case ShutdownIndex:
-        controller.shutdown(ControllerInfo.server, ControllerInfo.serverport);
-        break;
-      case UnknownCommandIndex:
-      default:
-        ELOG(0, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
-        return 255;
-        break;
-    }
-
-    {
-      io_service.reset();
-      Info info("io_service: Phase Two");
-      io_service.run();
-    }
-
-    // Final phase: Print result of command
-
-    switch(commandIndex) {
-      case AddJobsIndex:
-      case CreateJobsIndex:
-        break;
-      case CheckResultsIndex: 
-      {
-        const std::pair<size_t, size_t> JobStatus = controller.getJobStatus();
-        LOG(1, "INFO: #" << JobStatus.first << " are waiting in the queue and #" << JobStatus.second << " jobs are calculated so far.");
-        break;
-      }
-      case ReceiveResultsIndex:
-      {
-        std::vector<FragmentResult::ptr> results = controller.getReceivedResults();
-        printReceivedResults(results);
-        break;
-      }
-      case ReceiveMPQCIndex:
-      {
-        const std::string path = vm["fragment-path"].as< std::string >();
-        LOG(1, "INFO: Parsing fragment files from " << path << ".");
-        std::vector<FragmentResult::ptr> results = controller.getReceivedResults();
-        printReceivedMPQCResults(
-            results,
-            path,
-            getNoAtomsFromAdjacencyFile(path));
-        break;
-      }
-      case RemoveAllIndex:
-        break;
-      case ShutdownIndex:
-        break;
-      case UnknownCommandIndex:
-      default:
-        ELOG(0, "Unrecognized command '"+toString(ControllerInfo.command)+"'.");
-        return 255;
-        break;
+        io_service.reset();
+        Info info((std::string("io_service: ")+toString(phase)).c_str());
+        io_service.run();
+      }
     }
     Exitflag = controller.getExitflag();