Changeset 35f587 for src/Fragmentation/Automation/FragmentQueue.cpp

Timestamp:

Jun 26, 2012, 7:51:04 AM (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:

7670865

Parents:

f0834d

git-author:

Frederik Heber <heber@…> (02/06/12 09:33:27)

git-committer:

Frederik Heber <heber@…> (06/26/12 07:51:04)

Message:

FragmentResult is now also encapsulated in boost::shared_ptr.

• this allows in the same way to have different implementations of an abstract FragmentResult class.

File:

• src/Fragmentation/Automation/FragmentQueue.cpp (modified) (6 diffs)

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -24 +24 @@
 #include "CodePatterns/Assert.hpp"
 
-FragmentResult FragmentQueue::NoResult(-1);
-FragmentResult FragmentQueue::NoResultQueued(-2);
-FragmentResult FragmentQueue::ResultDelivered(-3);
+FragmentResult::ptr FragmentQueue::NoResult( new FragmentResult(-1) );
+FragmentResult::ptr FragmentQueue::NoResultQueued( new FragmentResult(-2) );
+FragmentResult::ptr FragmentQueue::ResultDelivered( new FragmentResult(-3) );
 
 /** Constructor for class FragmentQueue.
@@ -106 +106 @@
  * @return true - result is a present, valid result, false - result is one of the statics
  */
-bool FragmentQueue::isPresentResult(const FragmentResult &_result) const
+bool FragmentQueue::isPresentResult(const FragmentResult::ptr result) const
 {
-  return (_result != NoResult)
-      && (_result != NoResultQueued)
-      && (_result != ResultDelivered);
+  return (*result != *NoResult)
+      && (*result != *NoResultQueued)
+      && (*result != *ResultDelivered);
 }
 
@@ -134 +134 @@
   for (ResultMap::const_iterator iter = results.begin();
       iter != results.end(); ++iter)
-    if ((iter->second != NoResult)
-        && (iter->second != NoResultQueued)
-        && (iter->second != ResultDelivered))
+    if (isPresentResult(iter->second))
       ++doneJobs;
     return doneJobs;
@@ -148 +146 @@
  * \return result for job of given \a jobid
  */
-FragmentResult FragmentQueue::getResult(JobId_t jobid)
+FragmentResult::ptr FragmentQueue::getResult(JobId_t jobid)
 {
   ResultMap::iterator iter = results.find(jobid);
   ASSERT(iter != results.end(),
       "FragmentQueue::pushResult() - job "+toString(jobid)+" is not known to us.");
-  ASSERT(iter->second != NoResult,
+  ASSERT(*iter->second != *NoResult,
       "FragmentQueue::pushResult() - job "+toString(jobid)+" has not been request for calculation yet.");
-  ASSERT(iter->second != NoResultQueued,
+  ASSERT(*iter->second != *NoResultQueued,
       "FragmentQueue::pushResult() - job "+toString(jobid)+"'s calculation is underway but not result has arrived yet.");
-  ASSERT(iter->second != ResultDelivered,
+  ASSERT(*iter->second != *ResultDelivered,
       "FragmentQueue::pushResult() - job "+toString(jobid)+"'s result has already been delivered.");
   /// store result
-  FragmentResult _result = iter->second;
+  FragmentResult::ptr _result = iter->second;
   /// mark as delivered in map
   iter->second = ResultDelivered;
@@ -167 +165 @@
 }
 
-std::vector<FragmentResult> FragmentQueue::getAllResults()
+std::vector<FragmentResult::ptr> FragmentQueue::getAllResults()
 {
-  std::vector<FragmentResult> returnresults;
+  std::vector<FragmentResult::ptr> returnresults;
   for (ResultMap::iterator iter = results.begin();
       iter != results.end(); ++iter) {
@@ -187 +185 @@
  * \param result result of job to store
  */
-void FragmentQueue::pushResult(FragmentResult &_result)
+void FragmentQueue::pushResult(FragmentResult::ptr &_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.");
-  ASSERT(iter->second == NoResultQueued,
-      "FragmentQueue::pushResult() - is not waiting for the result of job "+toString(_result.getId())+".");
+      "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())+".");
   /// and overwrite NoResult in found entry
   iter->second = _result;