Changeset 425fc6 for src/Fragmentation/Automation/controller.cpp

Timestamp:

Jul 2, 2012, 7:54:12 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:

9d14c3

Parents:

6b3a37

git-author:

Frederik Heber <heber@…> (03/04/12 20:11:38)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:12)

Message:

FIX: Renamed ReceiveJobsOperation -> SendJobsOperation in file and class.

• also name is receivejobs -> sendjobs.
• also renamed ControllerChoices enum ReceiveJobs -> SendJobs.
• The Operations should have been named actively, i.e. from the point of the instance who executes it.

File:

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

src/Fragmentation/Automation/controller.cpp

@@ -42 +42 @@
 #include "Controller/Commands/CheckResultsOperation.hpp"
 #include "Controller/Commands/GetNextJobIdOperation.hpp"
-#include "Controller/Commands/ReceiveJobsOperation.hpp"
+#include "Controller/Commands/SendJobsOperation.hpp"
 #include "Controller/Commands/SendResultsOperation.hpp"
 #include "Controller/Commands/ShutdownOperation.hpp"
@@ -132 +132 @@
     std::vector<FragmentJob::ptr> &jobs)
 {
-  ReceiveJobsOperation *recjobs = static_cast<ReceiveJobsOperation *>(
-      controller.Commands.getByName("receivejobs"));
-  recjobs->addJobs(jobs);
+  SendJobsOperation *sendjobs = static_cast<SendJobsOperation *>(
+      controller.Commands.getByName("sendjobs"));
+  sendjobs->addJobs(jobs);
+  const size_t presentJobs = sendjobs->getPresentJobs();
+  LOG(1, "INFO: #" << presentJobs << " jobs are now waiting to be transmitted.");
 }
 
@@ -148 +150 @@
     const std::string &service)
 {
-  ReceiveJobsOperation *recjobs = static_cast<ReceiveJobsOperation *>(
-      controller.Commands.getByName("receivejobs"));
-  (*recjobs)(host, service);
+  SendJobsOperation *sendjobs = static_cast<SendJobsOperation *>(
+      controller.Commands.getByName("sendjobs"));
+  const size_t presentJobs = sendjobs->getPresentJobs();
+  LOG(1, "INFO: #" << presentJobs << " jobs are being sent to the server.");
+  (*sendjobs)(host, service);
 }