Changeset bae7bc for src/Fragmentation/Automation/FragmentJobQueue.cpp

Timestamp:

Apr 15, 2013, 10:28:25 AM (12 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:

503acc1

Parents:

4f44ae

git-author:

Frederik Heber <heber@…> (03/04/13 14:14:10)

git-committer:

Frederik Heber <heber@…> (04/15/13 10:28:25)

Message:

Outsourced parsing of fragment files into ParseFragmentJobsAction from FragmentationAutomationAction.

• We now solely rely on the job queue to contain all the information we need.
• FragmentationAutomationAction now clears queue after calculation.

File:

• src/Fragmentation/Automation/FragmentJobQueue.cpp (modified) (2 diffs)

src/Fragmentation/Automation/FragmentJobQueue.cpp

@@ -45 +45 @@
 
 #include "Box.hpp"
+#include "Fragmentation/Automation/parseKeySetFile.hpp"
 #include "Helpers/defs.hpp"
 #include "Jobs/MPQCJob.hpp"
@@ -89 +90 @@
 }
 
+bool FragmentJobQueue::addKeySetsFromFiles(
+    const boost::filesystem::path &path,
+    const size_t FragmentCounter,
+    const enum KeySetFileType keysettype
+    )
+{
+  const size_t NoJobs = KeySets.KeySets.size();
+  parseKeySetFile(KeySets, path.string(), FragmentCounter, NonHydrogenKeySets);
+  ASSERT( (KeySets.KeySets.size()-NoJobs) == FragmentCounter,
+      "FragmentJobQueue::addKeySetsFromFiles() - mismatching number of new fragments "
+      +toString(KeySets.KeySets.size()-NoJobs)+" and number of Keyset "
+      +toString(FragmentCounter)+".");
+  return (KeySets.KeySets.size() > NoJobs);
+}
+
+bool FragmentJobQueue::addFullKeySetsFromFiles(
+    const boost::filesystem::path &path,
+    const size_t FragmentCounter,
+    const enum KeySetFileType keysettype
+    )
+{
+  const size_t NoJobs = FullKeySets.KeySets.size();
+  parseKeySetFile(FullKeySets, path.string(), FragmentCounter, NonHydrogenKeySets);
+  ASSERT( (FullKeySets.KeySets.size()-NoJobs) == FragmentCounter,
+      "FragmentJobQueue::addKeySetsFromFiles() - mismatching number of fragments "
+      +toString(FullKeySets.KeySets.size()-NoJobs)+" and number of FullKeyset "
+      +toString(FragmentCounter)+".");
+  return (FullKeySets.KeySets.size() > NoJobs);
+}
+
 void FragmentJobQueue::clear()
 {