Changeset a1b77d for src

Timestamp:

May 4, 2012, 2:19:06 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:

0bdd51b

Parents:

7b22e9

git-author:

Frederik Heber <heber@…> (11/24/11 20:24:07)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:19:06)

Message:

Added call FragmentJob::Work() to FragmentWorker::handle_read().

• FragmentWorker also now contains FragmentResult instance, pendant to FragmentJob.
• added FragmentResult cstor with empty parameters (uses JobId::NoJob).

Location:

src/Fragmentation/Automation

Files:

• FragmentResult.cpp (modified) (2 diffs)
• FragmentResult.hpp (modified) (1 diff)
• FragmentWorker.cpp (modified) (3 diffs)
• FragmentWorker.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentResult.cpp

@@ -22 +22 @@
 #include "FragmentResult.hpp"
 
-
 /** Constructor of class FragmentResult.
  *
@@ -30 +29 @@
   JobId(_id),
   result(std::string("Nothing"))
+{}
+
+/** Constructor of class FragmentResult.
+ */
+FragmentResult::FragmentResult(const JobId_t _id, const std::string _result) :
+  JobId(_id),
+  result(_result)
 {}
 

src/Fragmentation/Automation/FragmentResult.hpp

@@ -36 +36 @@
 public:
   FragmentResult(const JobId_t id);
+  FragmentResult(const JobId_t id, const std::string _result);
   FragmentResult(const FragmentResult &other);
   ~FragmentResult();

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -41 +41 @@
     const std::string& host,
     const std::string& service) :
-  connection_(io_service)
+  connection_(io_service),
+  result(JobId::IllegalJob)
 {
     Info info(__FUNCTION__);
@@ -96 +97 @@
       std::cout << "Job output: " << job.outputfile << "\n";
       std::cout << "Job id: " << job.getId() << "\n";
+      // do something .. right now: wait
+      result = job.Work();
     } else {
       std::cout << "The server has no job for me." << std::endl;
@@ -109 +112 @@
   // work to do and the client will exit.
 }
-

src/Fragmentation/Automation/FragmentWorker.hpp

@@ -18 +18 @@
 #include "Connection.hpp"
 #include "FragmentJob.hpp"
+#include "FragmentResult.hpp"
 
 /** Receives a job from Server to execute and return FragmentResult.
@@ -42 +43 @@
   /// The data received from the server.
   FragmentJob job;
+
+  /// The result created to be sent to the server.
+  FragmentResult result;
 };