Changeset 9875cc for src

Timestamp:

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

cde0fe

Parents:

2445fb

git-author:

Frederik Heber <heber@…> (11/27/11 20:52:48)

git-committer:

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

Message:

Added FragmentQueue::pushJobs() to add a bunch of jobs simultaneously.

• also extended unit test.

Location:

src/Fragmentation/Automation

Files:

• FragmentQueue.cpp (modified) (1 diff)
• FragmentQueue.hpp (modified) (2 diffs)
• unittests/FragmentQueueUnitTest.cpp (modified) (5 diffs)
• unittests/FragmentQueueUnitTest.hpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -56 +56 @@
 void FragmentQueue::pushJob(FragmentJob &job)
 {
-  ASSERT(job.getId() != (JobId_t)-1,
-      "FragmentQueue::pushJob() - job to push has no valid id.");
+  ASSERT(job.getId() != JobId::IllegalJob,
+      "FragmentQueue::pushJob() - job to push has IllegalJob id.");
   ASSERT(!results.count(job.getId()),
       "FragmentQueue::pushJob() - job id "+toString(job.getId())+" has already been used.");
   results.insert( std::make_pair(job.getId(), NoResult));
   jobs.push_back(job);
+}
+
+/** Pushes a bunch of FragmentJob's into the internal queue for delivery to server.
+ *
+ * \note we throw assertion when jobid has already been used.
+ *
+ * \sa pushJob()
+ *
+ * \param _jobs jobs to enter into queue
+ */
+void FragmentQueue::pushJobs(std::vector<FragmentJob> &_jobs)
+{
+  for (std::vector<FragmentJob>::iterator iter = _jobs.begin();
+      iter != _jobs.end(); ++iter)
+    pushJob(*iter);
 }
 

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -16 +16 @@
 #include <deque>
 #include <map>
+#include <vector>
 
 #include "types.hpp"
@@ -36 +37 @@
   // entering jobs into queue
   void pushJob(FragmentJob &job);
+  void pushJobs(std::vector<FragmentJob> &_jobs);
   FragmentJob popJob();
   bool isJobPresent() const;

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -22 +22 @@
 #include <cppunit/ui/text/TestRunner.h>
 
+#include "FragmentQueueUnitTest.hpp"
+
+#include <vector>
+
+#include "CodePatterns/Assert.hpp"
 #include "FragmentQueue.hpp"
 
-#include "FragmentQueueUnitTest.hpp"
-
-#include "CodePatterns/Assert.hpp"
 
 #ifdef HAVE_TESTRUNNER
@@ -54 +56 @@
 /** UnitTest for working JobQueue
  */
-void FragmentQueueTest::JobsTest()
+void FragmentQueueTest::JobTest()
 {
   FragmentJob testJob;
@@ -77 +79 @@
   CPPUNIT_ASSERT_EQUAL(true, queue->isJobPresent() );
   CPPUNIT_ASSERT_EQUAL((size_t)1, queue->results.size());
-  FragmentQueue::ResultMap::const_iterator iter = queue->results.find((JobId_t)1);
-  CPPUNIT_ASSERT( iter != queue->results.end() );
-  CPPUNIT_ASSERT( FragmentQueue::NoResult == iter->second );
+  {
+    FragmentQueue::ResultMap::const_iterator iter = queue->results.find((JobId_t)1);
+    CPPUNIT_ASSERT( iter != queue->results.end() );
+    CPPUNIT_ASSERT( FragmentQueue::NoResult == iter->second );
+  }
 
   // push same id again
@@ -101 +105 @@
   CPPUNIT_ASSERT_EQUAL(false, queue->isJobPresent() );
   CPPUNIT_ASSERT_EQUAL((size_t)1, queue->results.size());
-  iter = queue->results.find((JobId_t)1);
-  CPPUNIT_ASSERT( iter != queue->results.end() );
-  CPPUNIT_ASSERT( FragmentQueue::NoResultQueued == iter->second );
+  {
+    FragmentQueue::ResultMap::const_iterator iter = queue->results.find((JobId_t)1);
+    CPPUNIT_ASSERT( iter != queue->results.end() );
+    CPPUNIT_ASSERT( FragmentQueue::NoResultQueued == iter->second );
+  }
 
 #ifndef NDEBUG
@@ -109 +115 @@
   CPPUNIT_ASSERT_THROW( queue->popJob(), Assert::AssertionFailure );
 #endif
+}
+
+/** UnitTest for adding multiple jobs at a time.
+ */
+void FragmentQueueTest::JobsTest()
+{
+  // prepare some jobs
+  FragmentJob testJob;
+  testJob.setId((JobId_t)1);
+  testJob.outputfile = std::string("do something");
+  FragmentJob anothertestJob;
+  anothertestJob.setId((JobId_t)2);
+  anothertestJob.outputfile = std::string("do something else");
+
+  // prepare a vector of them
+  std::vector<FragmentJob> testjobs;
+  testjobs.push_back(testJob);
+  testjobs.push_back(anothertestJob);
+
+  // prepare another vector of them
+  std::vector<FragmentJob> sametestjobs;
+  sametestjobs.push_back(testJob);
+  sametestjobs.push_back(anothertestJob);
+
+  // push the vector
+  CPPUNIT_ASSERT_EQUAL( (size_t)0, queue->jobs.size() );
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJobs(testjobs) );
+#else
+  queue->pushJobs(testjobs);
+#endif
+  CPPUNIT_ASSERT_EQUAL( (size_t)2, queue->jobs.size() );
+  CPPUNIT_ASSERT_EQUAL((size_t)2, queue->results.size());
+  {
+    FragmentQueue::ResultMap::const_iterator iter = queue->results.find((JobId_t)1);
+    CPPUNIT_ASSERT( iter != queue->results.end() );
+    CPPUNIT_ASSERT( FragmentQueue::NoResult == iter->second );
+  }
+  {
+    FragmentQueue::ResultMap::const_iterator iter = queue->results.find((JobId_t)2);
+    CPPUNIT_ASSERT( iter != queue->results.end() );
+    CPPUNIT_ASSERT( FragmentQueue::NoResult == iter->second );
+  }
+  // push again
+#ifndef NDEBUG
+  std::cout << "The following assertion is intended and does not indicate a failure." << std::endl;
+  CPPUNIT_ASSERT_THROW( queue->pushJobs(testjobs), Assert::AssertionFailure );
+#endif
+
+  CPPUNIT_ASSERT_EQUAL( (size_t)2, queue->jobs.size() );
+  CPPUNIT_ASSERT_EQUAL((size_t)2, queue->results.size());
 }
 

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp

@@ -24 +24 @@
 {
     CPPUNIT_TEST_SUITE( FragmentQueueTest) ;
+    CPPUNIT_TEST ( JobTest );
     CPPUNIT_TEST ( JobsTest );
     CPPUNIT_TEST ( ResultsTest );
@@ -31 +32 @@
       void setUp();
       void tearDown();
+      void JobTest();
       void JobsTest();
       void ResultsTest();