Changeset 865a218

Timestamp:

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

ee61ce

Parents:

ad39c2

git-author:

Frederik Heber <heber@…> (06/01/12 17:54:41)

git-committer:

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

Message:

Merged createjobs() and creatingJob() into createJob() in controller.cpp.

File:

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

src/controller.cpp

@@ -59 +59 @@
   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.
- *
- * @param jobs created job is added to this vector
- * @param command command to execute for SystemCommandJob
- * @param argument argument for command to execute
- * @param nextid id for this job
- */
-void createjobs(
-    std::vector<FragmentJob::ptr> &jobs,
-    const std::string &command,
-    const std::string &argument,
-    const JobId_t nextid)
-{
-  FragmentJob::ptr testJob( new SystemCommandJob(command, argument, nextid) );
-  jobs.push_back(testJob);
-  LOG(1, "INFO: Added one SystemCommandJob.");
 }
 
@@ -288 +270 @@
 }
 
-void creatingJob(FragmentController &controller, const ControllerOptions_SystemCommandJob &ControllerInfo)
+/** Creates a SystemCommandJob out of give \a command with \a argument.
+ *
+ * @param controller reference to controller to add jobs
+ * @param ControllerInfo information on the job
+ */
+void createJobs(FragmentController &controller, const ControllerOptions_SystemCommandJob &ControllerInfo)
 {
   const JobId_t next_id = controller.getAvailableId();
+  FragmentJob::ptr testJob(
+      new SystemCommandJob(ControllerInfo.executable, ControllerInfo.jobcommand, next_id) );
   std::vector<FragmentJob::ptr> jobs;
-  createjobs(jobs, ControllerInfo.executable, ControllerInfo.jobcommand, next_id);
+  jobs.push_back(testJob);
   controller.addJobs(jobs);
   controller.sendJobs(ControllerInfo.server, ControllerInfo.serverport);
+  LOG(1, "INFO: Added one SystemCommandJob.");
 }
 
@@ -346 +336 @@
       (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)))
+      (boost::bind(&createJobs, boost::ref(controller), boost::cref(ControllerInfo)))
       ;
   std::deque<ControllerCommand> checkresultsQueue = boost::assign::list_of< ControllerCommand >