Changeset 554809 for src

Timestamp:

Jun 27, 2012, 4:07:20 PM (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:

509014

Parents:

d1dbfc

git-author:

Frederik Heber <heber@…> (02/16/12 12:40:35)

git-committer:

Frederik Heber <heber@…> (06/27/12 16:07:20)

Message:

createjobs now gets two options: command, argument.

File:

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

src/Fragmentation/Automation/controller.cpp

@@ -86 +86 @@
 }
 
-void createjobs(std::vector<FragmentJob::ptr> &jobs, const JobId_t nextid)
-{
-  FragmentJob::ptr testJob( new SystemCommandJob( std::string("cat"), std::string("Nothing"), nextid) );
+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 empty SystemCommandJob's.");
+  LOG(1, "INFO: Added one SystemCommandJob.");
 }
 
@@ -286 +290 @@
       case CreateJobsIndex:
       {
-        requestid(controller, argv[1], argv[2]);
+        std::vector<FragmentJob::ptr> jobs;
+        if (argc < 6) {
+          ELOG(1, "'createjobs' requires two options: [command] [argument].");
+        } else {
+          requestid(controller, argv[1], argv[2]);
+        }
         break;
       }
@@ -331 +340 @@
       {
         std::vector<FragmentJob::ptr> jobs;
-          const JobId_t next_id = getavailableid(controller);
-          createjobs(jobs, next_id);
+        if (argc < 6) {
+                ELOG(1, "'createjobs' requires two options: [command] [argument].");
+              } else {
+                const JobId_t next_id = getavailableid(controller);
+                const std::string command(argv[4]);
+                const std::string argument(argv[5]);
+          LOG(1, "INFO: Creating SystemCommandJob with command '"
+            +command+"', argument '"+argument+"', and id "+toString(next_id)+".");
+          createjobs(jobs, command, argument, next_id);
+        }
         addjobs(controller, jobs);
         sendjobs(controller, argv[1], argv[2]);