Changeset 7ca772 for src/Fragmentation/Automation/Controller/FragmentController.hpp

Timestamp:

Jun 22, 2012, 8:19:29 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:

246d97

Parents:

50f418

git-author:

Frederik Heber <heber@…> (12/12/11 08:32:27)

git-committer:

Frederik Heber <heber@…> (06/22/12 08:19:29)

Message:

Operations are now contained in CommandRegistry in FragmentController.

• this is a tiny bit less nice due to required static_cast<>, however in the end we hopefully win due to possible placement inside a Queue.
• FragmentController:getExitflag() can now just browse through all present Operations and return the first fail.
• TESTFIX: changed regression tests Fragmentation/Automation a bit due to:
  • server-worker,addingjobs: addjobs now always adds two jobs.
  • JobAdder, ResultChecker, ResultGetter, and Shutdowner have been removed in favor of Controller and a specific command token.

File:

• src/Fragmentation/Automation/Controller/FragmentController.hpp (modified) (3 diffs)

src/Fragmentation/Automation/Controller/FragmentController.hpp

@@ -22 +22 @@
 #include "FragmentResult.hpp"
 
-#include "Controller/Commands/Operation.hpp"
-#include "Controller/Commands/CheckResultsOperation.hpp"
-#include "Controller/Commands/ReceiveJobsOperation.hpp"
-#include "Controller/Commands/SendResultsOperation.hpp"
-#include "Controller/Commands/ShutdownOperation.hpp"
+#include "Controller/CommandRegistry.hpp"
 
 /** The FragmentController sends bunches of jobs to a FragmentScheduler,
@@ -43 +39 @@
   ~FragmentController();
 
+  /// getter for operations exit flag.
+  size_t getExitflag() const;
+
 protected:
   /// The Connection to the server.
@@ -48 +47 @@
 
 public:
-
-  ReceiveJobsOperation recjobs;
-  CheckResultsOperation checkres;
-  SendResultsOperation  sendres;
-  ShutdownOperation shutdown;
-
-  // get the exit flag of the last operations
-  size_t getExitflag() const
-  {
-    if (recjobs.getExitflag() != 0)
-      return recjobs.getExitflag();
-    if (checkres.getExitflag() != 0)
-      return checkres.getExitflag();
-    if (sendres.getExitflag() != 0)
-      return sendres.getExitflag();
-    if (shutdown.getExitflag() != 0)
-      return shutdown.getExitflag();
-    return 0;
-  }
-
+  /// Registry with all commands of this controller
+  CommandRegistry Commands;
 };