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

778abb

Parents:

402bde

git-author:

Frederik Heber <heber@…> (02/16/12 16:14:38)

git-committer:

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

Message:

Added getAllResults() to FragmentQueue.

• added convenience function ::IsPresentResult().
• this is to replace FragmentSchedulder::getResults() which relies on jobs being filled still.
• added unit test on getAllResults().

Location:

src/Fragmentation/Automation

Files:

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

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -98 +98 @@
 }
 
+/** Internal function to check whether result is not one of static entities.
+ *
+ * @param result result to check against
+ * @return true - result is a present, valid result, false - result is one of the statics
+ */
+bool FragmentQueue::isPresentResult(const FragmentResult &_result) const
+{
+  return (_result != NoResult)
+      && (_result != NoResultQueued)
+      && (_result != ResultDelivered);
+}
+
 /** Queries whether a job has already been finished and the result is present.
  *
@@ -107 +119 @@
   ResultMap::const_iterator iter = results.find(jobid);
   return ((iter != results.end())
-      && (iter->second != NoResult)
-      && (iter->second != NoResultQueued)
-      && (iter->second != ResultDelivered));
+      && isPresentResult(iter->second));
 }
 
@@ -147 +157 @@
       "FragmentQueue::pushResult() - job "+toString(jobid)+"'s result has already been delivered.");
   /// store result
-  FragmentResult result = iter->second;
+  FragmentResult _result = iter->second;
   /// mark as delivered in map
   iter->second = ResultDelivered;
   /// and return result
-  return result;
+  return _result;
+}
+
+std::vector<FragmentResult> FragmentQueue::getAllResults()
+{
+  std::vector<FragmentResult> returnresults;
+  for (ResultMap::iterator iter = results.begin();
+      iter != results.end(); ++iter) {
+    if (isPresentResult(iter->second)) {
+      returnresults.push_back(getResult(iter->first));
+      iter = results.begin();
+    }
+  }
+
+  return returnresults;
 }
 
@@ -160 +184 @@
  * \param result result of job to store
  */
-void FragmentQueue::pushResult(FragmentResult &result)
+void FragmentQueue::pushResult(FragmentResult &_result)
 {
   /// check for presence
-  ResultMap::iterator iter = results.find(result.getId());
+  ResultMap::iterator iter = results.find(_result.getId());
   ASSERT(iter != results.end(),
-      "FragmentQueue::pushResult() - job "+toString(result.getId())+" is not known to us.");
+      "FragmentQueue::pushResult() - job "+toString(_result.getId())+" is not known to us.");
   ASSERT(iter->second == NoResultQueued,
-      "FragmentQueue::pushResult() - is not waiting for the result of job "+toString(result.getId())+".");
+      "FragmentQueue::pushResult() - is not waiting for the result of job "+toString(_result.getId())+".");
   /// and overwrite NoResult in found entry
-  iter->second = result;
+  iter->second = _result;
 }
+

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -44 +44 @@
   bool isResultPresent(JobId_t jobid) const;
   FragmentResult getResult(JobId_t jobid);
-  void pushResult(FragmentResult &result);
+  void pushResult(FragmentResult &_result);
+  std::vector<FragmentResult> getAllResults();
+
   size_t getDoneJobs() const;
 
 private:
+  bool isPresentResult(const FragmentResult &_result) const;
+
   //!> result that takes place in ResultQueue after job has arrived before it has been popped.
   static FragmentResult NoResult;

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.cpp

@@ -234 +234 @@
 #endif
 }
+
+/** UnitTest for working ResultMap
+ */
+void FragmentQueueTest::AllResultsTest()
+{
+  // prepare a job
+  FragmentJob testJob;
+  testJob.setId(1);
+  testJob.outputfile = std::string("do something");
+  FragmentJob anothertestJob;
+  anothertestJob.setId(2);
+  anothertestJob.outputfile = std::string("do something else");
+
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJob(testJob) );
+  CPPUNIT_ASSERT_NO_THROW( queue->pushJob(anothertestJob) );
+#else
+  queue->pushJob(testJob);
+  queue->pushJob(anothertestJob);
+#endif
+
+  // check that no results are returned.
+  {
+    const std::vector<FragmentResult> results = queue->getAllResults();
+    CPPUNIT_ASSERT_EQUAL( (size_t)0, results.size() );
+  }
+
+  // pop both as if some work was being done
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->popJob() );
+  CPPUNIT_ASSERT_NO_THROW( queue->popJob() );
+#else
+  queue->popJob();
+  queue->popJob();
+#endif
+
+  // prepare a result
+  FragmentResult testResult(1);
+  FragmentResult anothertestResult(2);
+
+  // push correct result
+#ifndef NDEBUG
+  CPPUNIT_ASSERT_NO_THROW( queue->pushResult(testResult) );
+  CPPUNIT_ASSERT_NO_THROW( queue->pushResult(anothertestResult) );
+#else
+  queue->pushResult(testResult);
+  queue->pushResult(anothertestResult);
+#endif
+
+  // check that two results are returned.
+  {
+    const std::vector<FragmentResult> results = queue->getAllResults();
+    CPPUNIT_ASSERT_EQUAL( (size_t)2, results.size() );
+  }
+}
+

src/Fragmentation/Automation/unittests/FragmentQueueUnitTest.hpp

@@ -27 +27 @@
     CPPUNIT_TEST ( JobsTest );
     CPPUNIT_TEST ( ResultsTest );
+    CPPUNIT_TEST ( AllResultsTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -35 +36 @@
       void JobsTest();
       void ResultsTest();
+      void AllResultsTest();
 
 private: