Changeset fb255d for src/Fragmentation/Automation/FragmentQueue.cpp

Timestamp:

Jul 2, 2012, 7:54:10 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:

2344a3

Parents:

d6b12c

git-author:

Frederik Heber <heber@…> (02/29/12 17:39:33)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:10)

Message:

WorkerPool is now observable.

• this is preparatory for allowing FragmentScheduler to contact idle Workers and sending them possibly present jobs.
• added NotificationObserver in unit test.

File:

• src/Fragmentation/Automation/FragmentQueue.cpp (modified) (1 diff)

src/Fragmentation/Automation/FragmentQueue.cpp

@@ -70 +70 @@
 void FragmentQueue::pushJob(FragmentJob::ptr job)
 {
-  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.");
-  OBSERVE;
-  NOTIFY(JobAdded);
-  results.insert( std::make_pair(job->getId(), NoResult));
-  jobs.push_back(job);
+  if ((job->getId() != JobId::IllegalJob) && (!results.count(job->getId()))) {
+    OBSERVE;
+    NOTIFY(JobAdded);
+    results.insert( std::make_pair(job->getId(), NoResult));
+    jobs.push_back(job);
+  } else {
+    ELOG(1, "job to push has IllegalJob id or id "+toString(job->getId())+" has already been used.");
+    ASSERT(false,
+        "job to push has IllegalJob id or id "+toString(job->getId())+" has already been used.");
+  }
 }