Changeset d9f2b3 for src

Timestamp:

Apr 29, 2014, 12:42:44 PM (11 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:

c09f94

Parents:

7fc447

git-author:

Frederik Heber <heber@…> (09/25/13 23:02:43)

git-committer:

Frederik Heber <heber@…> (04/29/14 12:42:44)

Message:

SpecificFragmentController has a ref to an updatehandler to call in case of new results.

• SpecificFragmentController::ResultsContainer::waitForResults() will regularly call the update handler which informs via Process::setCurrSteps().

Location:

src/Fragmentation/Automation

Files:

• SpecificFragmentController.cpp (modified) (2 diffs)
• SpecificFragmentController.hpp (modified) (3 diffs)
• SpecificFragmentController_ResultContainer_impl.hpp (modified) (2 diffs)

src/Fragmentation/Automation/SpecificFragmentController.cpp

@@ -43 +43 @@
 #include "CodePatterns/Info.hpp"
 
+#include <boost/bind.hpp>
+
+/** Simple NoOp as default handler for updates.
+ *
+ */
+static void NoOpHandler(const size_t step, const size_t total)
+{}
+
+SpecificFragmentController::SpecificFragmentController(boost::asio::io_service &_io_service) :
+  FragmentController(_io_service),
+  io_service(_io_service),
+  handler(boost::bind(&NoOpHandler, _1, _2))
+{}
+
 void SpecificFragmentController::RunService(std::string message)
 {
@@ -58 +72 @@
   RunService("Requesting ids");
 }
+

src/Fragmentation/Automation/SpecificFragmentController.hpp

@@ -19 +19 @@
 #include "JobMarket/Results/FragmentResult.hpp"
 
+#include <boost/function.hpp>
 #include <map>
 #include <string>
@@ -30 +31 @@
 {
 public:
-  SpecificFragmentController(boost::asio::io_service &_io_service) :
-    FragmentController(_io_service),
-    io_service(_io_service)
+  SpecificFragmentController(boost::asio::io_service &_io_service);
+  virtual ~SpecificFragmentController()
   {}
 
-  virtual ~SpecificFragmentController()
-  {}
+  typedef boost::function<void (const size_t,const size_t)> update_handler_t;
+
+  void setUpdateHandler(update_handler_t _handler)
+  {
+    handler = _handler;
+  }
 
   void requestIds(const size_t numberjobs);
@@ -101 +105 @@
   //!> reference to io_service for internal purposes
   boost::asio::io_service &io_service;
+  //!> update handler that is called in waitforResults()
+  update_handler_t handler;
 };
 

src/Fragmentation/Automation/SpecificFragmentController_ResultContainer_impl.hpp

@@ -60 +60 @@
   // wait but receive all results that are already done
   size_t NoReceivedResults = 0;
-  size_t oldNoCalculatedResults = 0;
   while (NoReceivedResults != NoExpectedResults) {
     // wait a bit
@@ -72 +71 @@
     const std::pair<size_t, size_t> JobStatus = callback.getJobStatus();
     const size_t NoCalculatedResults = JobStatus.second;
-    if (NoCalculatedResults != oldNoCalculatedResults) {
-      oldNoCalculatedResults = NoCalculatedResults;
-      LOG(1, "INFO: #" << JobStatus.first << " are waiting in the queue and #" << JobStatus.second << " jobs are calculated so far.");
-    }
-
     // if some are done, get them
     if (NoCalculatedResults != 0) {
       NoReceivedResults += receiveResults(callback);
+      callback.handler(NoReceivedResults, NoExpectedResults);
+      LOG(1, "INFO: #" << JobStatus.first << " are waiting in the queue and #" << NoReceivedResults << " of " << NoExpectedResults << " jobs are calculated so far.");
     }
   }