Changeset 7b22e9 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:

a1b77d

Parents:

c7deca

git-author:

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

git-committer:

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

Message:

FragmentJob now contains Work() function.

• Work() encapsulates all the work to do to calculate the FragmentResult such that FragmentWorker does not need to know anything about it.
• added WorkTest to unit test along with FragmentResultStub.
• added FragmentResult.[ch]pp to Worker sources in Makefile.am.

• also unit tests are now linked only against boost libs they really need.

Location:

src/Fragmentation/Automation

Files:

• FragmentJob.cpp (modified) (2 diffs)
• FragmentJob.hpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• unittests/FragmentJobUnitTest.cpp (modified) (2 diffs)
• unittests/FragmentJobUnitTest.hpp (modified) (2 diffs)
• unittests/Makefile.am (modified) (4 diffs)
• unittests/stubs/FragmentResultStub.cpp (added)

src/Fragmentation/Automation/FragmentJob.cpp

@@ -18 +18 @@
 #endif
 
+// boost asio needs specific operator new
+#include <boost/asio.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include "CodePatterns/MemDebug.hpp"
 
+#include "CodePatterns/Info.hpp"
+#include "CodePatterns/Log.hpp"
+#include "CodePatterns/toString.hpp"
 #include "FragmentJob.hpp"
+#include "FragmentResult.hpp"
 
 /** Constructor for class FragmentJob.
@@ -46 +54 @@
 {}
 
+/** Work routine of this FragmentJob.
+ *
+ * This function encapsulates all the work that has to be done to generate
+ * a FragmentResult. Hence, the FragmentWorker does not need to know anything
+ * about the operation: it just receives it and executes this function.
+ *
+ * \return result of this job
+ */
+FragmentResult FragmentJob::Work()
+{
+  Info info((std::string(__FUNCTION__)+std::string(", id #")+toString(getId())).c_str());
+  FragmentResult s(getId());
+
+  boost::asio::io_service io;
+  boost::asio::deadline_timer t(io, boost::posix_time::seconds(1));
+  LOG(1, "INFO: Deadline timer will now wait for 1 seconds.");
+  t.wait();
+  LOG(1, "INFO: Deadline timer is done.");
+
+  return s;
+}
+
 /** Comparator for class FragmentJob.
  * \param other instance to compare to

src/Fragmentation/Automation/FragmentJob.hpp

@@ -18 +18 @@
 #include "boost/serialization/array.hpp"
 
+#include "FragmentResult.hpp"
 #include "JobId.hpp"
 #include "types.hpp"
@@ -42 +43 @@
   ~FragmentJob();
 
+  FragmentResult Work();
+
   bool operator==(const FragmentJob &other) const;
 

src/Fragmentation/Automation/Makefile.am

@@ -36 +36 @@
   atexit.cpp \
   FragmentJob.cpp \
+  FragmentResult.cpp \
   FragmentWorker.cpp \
   JobId.cpp \
@@ -44 +45 @@
   Connection.hpp \
   FragmentJob.hpp \
+  FragmentResult.hpp \
   FragmentWorker.hpp \
   JobId.hpp

src/Fragmentation/Automation/unittests/FragmentJobUnitTest.cpp

@@ -29 +29 @@
 
 #include "FragmentJob.hpp"
+#include "FragmentResult.hpp"
+#include "JobId.hpp"
 
 #include "CodePatterns/Assert.hpp"
@@ -72 +74 @@
 }
 
+/** UnitTest for Work()
+ */
+void FragmentJobTest::WorkTest()
+{
+  FragmentJob testJob(command, 1);
+  FragmentJob othertestJob(command, 2);
+
+  FragmentResult testResult(testJob.Work());
+  FragmentResult othertestResult(othertestJob.Work());
+
+  CPPUNIT_ASSERT_EQUAL( (JobId_t)1, testResult.getId() );
+  CPPUNIT_ASSERT_EQUAL( (JobId_t)2, othertestResult.getId() );
+}
+
 /** UnitTest for serialization
  */

src/Fragmentation/Automation/unittests/FragmentJobUnitTest.hpp

@@ -25 +25 @@
     CPPUNIT_TEST ( equalityTest );
     CPPUNIT_TEST ( serializationTest );
+    CPPUNIT_TEST ( WorkTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -32 +33 @@
       void equalityTest();
       void serializationTest();
+      void WorkTest();
 
 private:

src/Fragmentation/Automation/unittests/Makefile.am

@@ -25 +25 @@
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
   $(BOOST_THREAD_LDFLAGS) $(BOOST_THREAD_LIBS) \
+  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
   ${CodePatterns_LIBS}
 
@@ -34 +35 @@
   FragmentJob.cpp \
   FragmentJob.hpp \
+  unittests/stubs/FragmentResultStub.cpp \
+  FragmentResult.hpp \
   JobId.cpp \
   JobId.hpp
 FragmentJobUnitTest_LDADD = \
-  ${FRAGMENTATIONLIBS} \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}
 
 FragmentQueueUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
@@ -53 +57 @@
   JobId.cpp \
   JobId.hpp
-FragmentQueueUnitTest_LDADD = $(FRAGMENTATIONAUTOMATIONLIBS)
+FragmentQueueUnitTest_LDADD = \
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}
 
 FragmentResultUnitTest_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
@@ -65 +72 @@
   JobId.hpp
 FragmentResultUnitTest_LDADD = \
-  ${FRAGMENTATIONLIBS} \
-  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
+  ${CodePatterns_LIBS}