Changeset 95454a for src/Fragmentation/Automation/FragmentWorker.hpp

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:

8d7917

Parents:

8036b7

git-author:

Frederik Heber <heber@…> (02/22/12 18:33:19)

git-committer:

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

Message:

Refactored main part in FragmentWorker into WorkOnJobOperation.

• essentially FragmentWorker just contains this Operation and nothing else.

File:

• src/Fragmentation/Automation/FragmentWorker.hpp (modified) (3 diffs)

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -18 +18 @@
 #include "Connection.hpp"
 #include "Jobs/FragmentJob.hpp"
+#include "Controller/Commands/WorkOnJobOperation.hpp"
 
 /** Receives a job from Server to execute and return FragmentResult.
@@ -29 +30 @@
       const std::string& host, const std::string& service);
 
-  enum Exitflag_t {
-    OkFlag = 0,
-    NoJobFlag = 1,
-    ErrorFlag = 255
-  };
-
   /** Returns the flag of the handled operation.
    *
@@ -40 +35 @@
   size_t getExitflag() const
   {
-    return Exitflag;
+    return operation.getExitflag();
   }
 
-protected:
-  /// Handle completion of a connect operation.
-  void handle_connect(const boost::system::error_code& e,
-      boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
-
-  /// Callback function when job has been received.
-  void handle_ReceiveJob(const boost::system::error_code& e);
-
-  /// Callback function when result has been sent.
-  void handle_SendResult(const boost::system::error_code& e);
-
 private:
-  // static entity of an empty result
-  static FragmentResult::ptr EmptyResult;
-
   /// The Connection to the server.
   Connection connection_;
 
-  /// The data received from the server.
-  FragmentJob::ptr job;
-
-  /// The result created to be sent to the server.
-  FragmentResult result;
-
-  /// exit flag to give at program exit
-  enum Exitflag_t Exitflag;
+  //!> operation that handles connection, getting, and working on job.
+  WorkOnJobOperation operation;
 };