Changeset 9d14c3

Timestamp:

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

50d095

Parents:

425fc6

git-author:

Frederik Heber <heber@…> (03/04/12 20:26:06)

git-committer:

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

Message:

FIX: Renamed SendResultsOperation -> ReceiveResultsOperation in file and class.

• also renamed name sendresults -> receiveresults.
• also renamed ControllerChoices enum SendResults -> ReceiveResults.

Location:

src/Fragmentation/Automation

Files:

• Controller/Commands/ReceiveResultsOperation.cpp (moved) (moved from src/Fragmentation/Automation/Controller/Commands/SendResultsOperation.cpp ) (10 diffs)
• Controller/Commands/ReceiveResultsOperation.hpp (moved) (moved from src/Fragmentation/Automation/Controller/Commands/SendResultsOperation.hpp ) (4 diffs)
• Controller/FragmentController.cpp (modified) (2 diffs)
• ControllerChoices.hpp (modified) (1 diff)
• FragmentScheduler.cpp (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• controller.cpp (modified) (4 diffs)

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

@@ -7 +7 @@
 
 /*
- * SendResultsOperation.cpp
+ * ReceiveResultsOperation.cpp
  *
  *  Created on: Dec 11, 2011
@@ -33 +33 @@
 #include "Results/FragmentResult.hpp"
 
-#include "Controller/Commands/SendResultsOperation.hpp"
+#include "Controller/Commands/ReceiveResultsOperation.hpp"
 
 /** Handle connect operation to send results.
@@ -40 +40 @@
  * \param endpoint_iterator endpoint of the connection
  */
-void SendResultsOperation::handle_connect(const boost::system::error_code& e,
+void ReceiveResultsOperation::handle_connect(const boost::system::error_code& e,
     boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
 {
@@ -47 +47 @@
   {
     // Successfully established connection. Give choice.
-    enum ControllerChoices choice = SendResults;
+    enum ControllerChoices choice = ReceiveResults;
     connection_.async_write(choice,
-      boost::bind(&SendResultsOperation::handle_ReceivingResults, this,
+      boost::bind(&ReceiveResultsOperation::handle_ReceivingResults, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {
@@ -56 +56 @@
     boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
     connection_.socket().async_connect(endpoint,
-      boost::bind(&SendResultsOperation::handle_connect, this,
+      boost::bind(&ReceiveResultsOperation::handle_connect, this,
       boost::asio::placeholders::error, ++endpoint_iterator));
   } else {
@@ -67 +67 @@
 }
 
-/** Callback function when results have been received.
+/** Callback function when preparing to receive results
  *
  * \param e error code if something went wrong
  */
-void SendResultsOperation::handle_ReceivingResults(const boost::system::error_code& e)
+void ReceiveResultsOperation::handle_ReceivingResults(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
   if (!e)
   {
-     // The connection::async_read() function will automatically
-     // decode the data that is written to the underlying socket.
-     LOG(1, "INFO: Sending "+toString(results.size())+" results ...");
-     connection_.async_read(results,
-        boost::bind(&SendResultsOperation::handle_ReceivedResults, this,
-        boost::asio::placeholders::error));
+    // The connection::async_read() function will automatically
+    // decode the data that is written to the underlying socket.
+    LOG(1, "INFO: Sending "+toString(results.size())+" results ...");
+    connection_.async_read(results,
+      boost::bind(&ReceiveResultsOperation::handle_ReceivedResults, this,
+      boost::asio::placeholders::error));
   }
   else
@@ -89 +89 @@
     ELOG(1, e.message());
   }
-
-  // Since we are not starting a new operation the io_service will run out of
-  // work to do and the client will exit.
 }
-
 
 /** Callback function when results have been received.
@@ -99 +95 @@
  * \param e error code if something went wrong
  */
-void SendResultsOperation::handle_ReceivedResults(const boost::system::error_code& e)
+void ReceiveResultsOperation::handle_ReceivedResults(const boost::system::error_code& e)
 {
   Info info(__FUNCTION__);
@@ -105 +101 @@
   LOG(1, "INFO: Received "+toString(results.size())+" results.");
 
-  AsyncOperation::handle_FinishOperation(e);
+  ReceiveResultsOperation::handle_FinishOperation(e);
 }
 
@@ -113 +109 @@
  * \return vector of results for the added jobs (\sa addJobs()).
  */
-std::vector<FragmentResult::ptr> SendResultsOperation::getResults()
+std::vector<FragmentResult::ptr> ReceiveResultsOperation::getResults()
 {
   Info info(__FUNCTION__);

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

@@ -1 +1 @@
 /*
- * SendResultsOperation.hpp
+ * ReceiveResultsOperation.hpp
  *
  *  Created on: Dec 11, 2011
@@ -6 +6 @@
  */
 
-#ifndef FRAGMENTCONTROLLER_SENDRESULTSOPERATION_HPP_
-#define FRAGMENTCONTROLLER_SENDRESULTSOPERATION_HPP_
+#ifndef FRAGMENTCONTROLLER_RECEIVERESULTSOPERATION_HPP_
+#define FRAGMENTCONTROLLER_RECEIVERESULTSOPERATION_HPP_
 
 // include config.h
@@ -23 +23 @@
 #include "Controller/Commands/AsyncOperation.hpp"
 
-class SendResultsOperation : public AsyncOperation  {
+class ReceiveResultsOperation : public AsyncOperation  {
 public:
-  /// Constructor for class SendResultsOperation.
-  SendResultsOperation(Connection &_connection) :
-    AsyncOperation(std::string("sendresults"), _connection) {}
-  /// Destructor for class SendResultsOperation
-  ~SendResultsOperation() {}
+  /// Constructor for class ReceiveResultsOperation.
+  ReceiveResultsOperation(Connection &_connection) :
+    AsyncOperation(std::string("receiveresults"), _connection) {}
+  /// Destructor for class ReceiveResultsOperation
+  ~ReceiveResultsOperation() {}
 
 public:
@@ -50 +50 @@
 };
 
-#endif /* FRAGMENTCONTROLLER_SENDRESULTSOPERATION_HPP_ */
+#endif /* FRAGMENTCONTROLLER_RECEIVERESULTSOPERATION_HPP_ */

src/Fragmentation/Automation/Controller/FragmentController.cpp

@@ -30 +30 @@
 #include "Controller/Commands/CheckResultsOperation.hpp"
 #include "Controller/Commands/GetNextJobIdOperation.hpp"
+#include "Controller/Commands/ReceiveResultsOperation.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 ReceiveResultsOperation(connection_));
   Commands.registerInstance(new SendJobsOperation(connection_));
-  Commands.registerInstance(new SendResultsOperation(connection_));
   Commands.registerInstance(new ShutdownOperation(connection_));
 }

src/Fragmentation/Automation/ControllerChoices.hpp

@@ -20 +20 @@
   SendJobs,
   CheckState,
-  SendResults,
+  ReceiveResults,
   ShutdownControllerSocket
 };

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -374 +374 @@
       break;
     }
-    case SendResults:
+    case ReceiveResults:
     {
       const std::vector<FragmentResult::ptr> results = JobsQueue.getAllResults();

src/Fragmentation/Automation/Makefile.am

@@ -48 +48 @@
   Controller/Commands/GetNextJobIdOperation.cpp \
   Controller/Commands/ObtainJobOperation.cpp \
+  Controller/Commands/ReceiveResultsOperation.cpp \
   Controller/Commands/RemoveFromPoolOperation.cpp \
   Controller/Commands/SendJobsOperation.cpp \
   Controller/Commands/SendJobToWorkerOperation.cpp \
-  Controller/Commands/SendResultsOperation.cpp \
   Controller/Commands/ShutdownOperation.cpp \
   Controller/Commands/ShutdownWorkerOperation.cpp \
@@ -65 +65 @@
   Controller/Commands/ObtainJobOperation.hpp \
   Controller/Commands/Operation.hpp \
+  Controller/Commands/ReceiveResultsOperation.hpp \
   Controller/Commands/RemoveFromPoolOperation.hpp \
   Controller/Commands/SendJobsOperation.hpp \
   Controller/Commands/SendJobToWorkerOperation.hpp \
-  Controller/Commands/SendResultsOperation.hpp \
   Controller/Commands/ShutdownOperation.hpp \
   Controller/Commands/ShutdownWorkerOperation.hpp \

src/Fragmentation/Automation/controller.cpp

@@ -42 +42 @@
 #include "Controller/Commands/CheckResultsOperation.hpp"
 #include "Controller/Commands/GetNextJobIdOperation.hpp"
+#include "Controller/Commands/ReceiveResultsOperation.hpp"
 #include "Controller/Commands/SendJobsOperation.hpp"
-#include "Controller/Commands/SendResultsOperation.hpp"
 #include "Controller/Commands/ShutdownOperation.hpp"
 #include "Jobs/MPQCCommandJob.hpp"
@@ -197 +197 @@
     const std::string &service)
 {
-  SendResultsOperation *sendres = static_cast<SendResultsOperation *>(
-      controller.Commands.getByName("sendresults"));
-  (*sendres)(host, service);
+  ReceiveResultsOperation *receiveres = static_cast<ReceiveResultsOperation *>(
+      controller.Commands.getByName("receiveresults"));
+  (*receiveres)(host, service);
 }
 
@@ -208 +208 @@
 void printreceivedresults(FragmentController &controller)
 {
-  SendResultsOperation *sendres = static_cast<SendResultsOperation *>(
-      controller.Commands.getByName("sendresults"));
-  std::vector<FragmentResult::ptr> results = sendres->getResults();
+  ReceiveResultsOperation *receiveres = static_cast<ReceiveResultsOperation *>(
+      controller.Commands.getByName("receiveresults"));
+  std::vector<FragmentResult::ptr> results = receiveres->getResults();
   for (std::vector<FragmentResult::ptr>::const_iterator iter = results.begin();
       iter != results.end(); ++iter)
@@ -222 +222 @@
 void printreceivedmpqcresults(FragmentController &controller, const std::string &KeySetFilename)
 {
-  SendResultsOperation *sendres = static_cast<SendResultsOperation *>(
-      controller.Commands.getByName("sendresults"));
-  std::vector<FragmentResult::ptr> results = sendres->getResults();
+  ReceiveResultsOperation *receiveres = static_cast<ReceiveResultsOperation *>(
+      controller.Commands.getByName("receiveresults"));
+  std::vector<FragmentResult::ptr> results = receiveres->getResults();
 
   // parse in KeySetfile