Changeset 425fc6 for src/Fragmentation/Automation/Controller

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.

Location:

src/Fragmentation/Automation/Controller

Files:

• Commands/SendJobsOperation.cpp (moved) (moved from src/Fragmentation/Automation/Controller/Commands/ReceiveJobsOperation.cpp ) (10 diffs)
• Commands/SendJobsOperation.hpp (moved) (moved from src/Fragmentation/Automation/Controller/Commands/ReceiveJobsOperation.hpp ) (4 diffs)
• FragmentController.cpp (modified) (2 diffs)

src/Fragmentation/Automation/Controller/Commands/SendJobsOperation.cpp

@@ -7 +7 @@
 
 /*
- * ReceiveJobsOperation.cpp
+ * SendJobsOperation.cpp
  *
  *  Created on: Dec 11, 2011
@@ -34 +34 @@
 #include "Jobs/FragmentJob.hpp"
 
-#include "Controller/Commands/ReceiveJobsOperation.hpp"
+#include "Controller/Commands/SendJobsOperation.hpp"
 
 /** Handle connect operation to receive jobs from controller
@@ -41 +41 @@
  * \param endpoint_iterator endpoint of the connection
  */
-void ReceiveJobsOperation::handle_connect(const boost::system::error_code& e,
+void SendJobsOperation::handle_connect(const boost::system::error_code& e,
     boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
 {
@@ -48 +48 @@
   {
     // Successfully established connection. Give choice.
-    enum ControllerChoices choice = ReceiveJobs;
+    enum ControllerChoices choice = SendJobs;
     connection_.async_write(choice,
-      boost::bind(&ReceiveJobsOperation::handle_SendJobs, this,
+      boost::bind(&SendJobsOperation::handle_SendJobs, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -57 +57 @@
     boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
     connection_.socket().async_connect(endpoint,
-      boost::bind(&ReceiveJobsOperation::handle_connect, this,
+      boost::bind(&SendJobsOperation::handle_connect, this,
       boost::asio::placeholders::error, ++endpoint_iterator));
   } else {
@@ -72 +72 @@
  * \param e error code if something went wrong
  */
-void ReceiveJobsOperation::handle_SendJobs(const boost::system::error_code& e)
+void SendJobsOperation::handle_SendJobs(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -82 +82 @@
     LOG(1, "INFO: Sending "+toString(jobs.size())+" jobs ...");
     connection_.async_write(jobs,
-      boost::bind(&ReceiveJobsOperation::handle_FinishOperation, this,
+      boost::bind(&SendJobsOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   }
@@ -100 +100 @@
  * \param e error code if something went wrong
  */
-void ReceiveJobsOperation::handle_FinishOperation(const boost::system::error_code& e)
+void SendJobsOperation::handle_FinishOperation(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -114 +114 @@
  * \param _jobs jobs to add
  */
-void ReceiveJobsOperation::addJobs(const std::vector<FragmentJob::ptr> &_jobs)
+void SendJobsOperation::addJobs(const std::vector<FragmentJob::ptr> &_jobs)
 {
   jobs.reserve(jobs.size()+_jobs.size());
@@ -120 +120 @@
     jobs.push_back(job);
   }
-  LOG(1, "INFO: ReceiveJobsOperation now contains " << jobs.size() << " job(s).");
+  LOG(1, "INFO: SendJobsOperation now contains " << jobs.size() << " job(s).");
 }
 

src/Fragmentation/Automation/Controller/Commands/SendJobsOperation.hpp

@@ -1 +1 @@
 /*
- * ReceiveJobsOperation.hpp
+ * SendJobsOperation.hpp
  *
  *  Created on: Dec 11, 2011
@@ -6 +6 @@
  */
 
-#ifndef FRAGMENTCONTROLLER_RECEIVEJOBSOPERATION_HPP_
-#define FRAGMENTCONTROLLER_RECEIVEJOBSOPERATION_HPP_
+#ifndef FRAGMENTCONTROLLER_SENDJOBSOPERATION_HPP_
+#define FRAGMENTCONTROLLER_SENDJOBSOPERATION_HPP_
 
 // include config.h
@@ -23 +23 @@
 #include "Controller/Commands/AsyncOperation.hpp"
 
-class ReceiveJobsOperation : public AsyncOperation {
+class SendJobsOperation : public AsyncOperation {
 public:
-  /// Constructor for class ReceiveJobsOperation.
-  ReceiveJobsOperation(Connection &_connection) :
-    AsyncOperation(std::string("receivejobs"), _connection) {}
-  /// Destructor for class ReceiveJobsOperation
-  ~ReceiveJobsOperation() {}
+  /// Constructor for class SendJobsOperation.
+  SendJobsOperation(Connection &_connection) :
+    AsyncOperation(std::string("sendjobs"), _connection) {}
+  /// Destructor for class SendJobsOperation
+  ~SendJobsOperation() {}
 
 public:
@@ -58 +58 @@
 };
 
-#endif /* FRAGMENTCONTROLLER_RECEIVEJOBSOPERATION_HPP_ */
+#endif /* FRAGMENTCONTROLLER_SENDJOBSOPERATION_HPP_ */

src/Fragmentation/Automation/Controller/FragmentController.cpp

@@ -30 +30 @@
 #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"
@@ -49 +49 @@
   Commands.registerInstance(new CheckResultsOperation(connection_));
   Commands.registerInstance(new GetNextJobIdOperation(connection_));
-  Commands.registerInstance(new ReceiveJobsOperation(connection_));
+  Commands.registerInstance(new SendJobsOperation(connection_));
   Commands.registerInstance(new SendResultsOperation(connection_));
   Commands.registerInstance(new ShutdownOperation(connection_));