Changeset 559385 for src

Timestamp:

Jun 27, 2012, 4:07:21 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:

fe95b7

Parents:

38032a

git-author:

Frederik Heber <heber@…> (03/04/12 16:08:09)

git-committer:

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

Message:

FIX: Replaced calls to Operation::handle_FinishOperation by <class>::handle_ ...

• if Operation::handle_FinishOperation() is protected member function, we call only bind to it like this.

Location:

src/Fragmentation/Automation/Controller/Commands

Files:

• CheckResultsOperation.cpp (modified) (1 diff)
• EnrollInPoolOperation.cpp (modified) (1 diff)
• SendJobToWorkerOperation.cpp (modified) (1 diff)
• SendResultsOperation.cpp (modified) (1 diff)

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

@@ -78 +78 @@
     LOG(1, "INFO: Obtaining number of present and done jobs ...");
     connection_.async_read(jobInfo,
-      boost::bind(&Operation::handle_FinishOperation, this,
+      boost::bind(&CheckResultsOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   }

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

@@ -43 +43 @@
     LOG(1, "INFO: Enrolling in pool with " << address << "...");
     connection_.async_write(address,
-      boost::bind(&Operation::handle_FinishOperation, this,
+      boost::bind(&EnrollInPoolOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {

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

@@ -46 +46 @@
     LOG(1, "INFO: Sending job #" << job->getId() << ".");
     connection_.async_write(job,
-      boost::bind(&Operation::handle_FinishOperation, this,
+      boost::bind(&SendJobToWorkerOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   } else if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator()) {

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

@@ -78 +78 @@
      // 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,