Changeset 3a1346 for src/Fragmentation

Timestamp:

May 17, 2012, 3:21:54 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:

50f418

Parents:

25b30aa

git-author:

Frederik Heber <heber@…> (12/11/11 17:31:37)

git-committer:

Frederik Heber <heber@…> (05/17/12 15:21:54)

Message:

Operation now requires an internal name to be placable in a Registry.

• derived class give specific name in their cstor.

Location:

src/Fragmentation/Automation/Controller/Commands

Files:

• CheckResultsOperation.hpp (modified) (1 diff)
• Operation.cpp (modified) (1 diff)
• Operation.hpp (modified) (2 diffs)
• ReceiveJobsOperation.hpp (modified) (1 diff)
• SendResultsOperation.hpp (modified) (1 diff)
• ShutdownOperation.hpp (modified) (1 diff)

src/Fragmentation/Automation/Controller/Commands/CheckResultsOperation.hpp

@@ -26 +26 @@
   /// Constructor for class CheckResultsOperation.
   CheckResultsOperation(Connection &_connection) :
-    Operation(_connection),
+    Operation(std::string("checkresults"), _connection),
     doneJobs(0)
         {}

src/Fragmentation/Automation/Controller/Commands/Operation.cpp

@@ -36 +36 @@
 /** Constructor for class Operation.
  *
+ * \param _name name for this Operation for retrieval from a registry
  * \param _connection connection to operate on
  */
-Operation::Operation(Connection &_connection) :
+Operation::Operation(const std::string &_name, Connection &_connection) :
     connection_(_connection),
+    name(_name),
     Exitflag(OkFlag)
 {}

src/Fragmentation/Automation/Controller/Commands/Operation.hpp

@@ -22 +22 @@
 class Operation {
 public:
-  Operation(Connection &_connection);
+  Operation(const std::string &_name, Connection &_connection);
   virtual ~Operation();
 public:
@@ -52 +52 @@
   }
 
+  std::string getName() const {
+    return name;
+  }
+
+private:
+  /// Name of this Operation (required for Registry pattern)
+  std::string name;
+
 protected:
   /// internal function to disconnect from server

src/Fragmentation/Automation/Controller/Commands/ReceiveJobsOperation.hpp

@@ -27 +27 @@
   /// Constructor for class ReceiveJobsOperation.
   ReceiveJobsOperation(Connection &_connection) :
-    Operation(_connection) {}
+    Operation(std::string("receivejobs"), _connection) {}
   /// Destructor for class ReceiveJobsOperation
   ~ReceiveJobsOperation() {}

src/Fragmentation/Automation/Controller/Commands/SendResultsOperation.hpp

@@ -27 +27 @@
   /// Constructor for class SendResultsOperation.
   SendResultsOperation(Connection &_connection) :
-    Operation(_connection) {}
+    Operation(std::string("sendresults"), _connection) {}
   /// Destructor for class SendResultsOperation
   ~SendResultsOperation() {}

src/Fragmentation/Automation/Controller/Commands/ShutdownOperation.hpp

@@ -26 +26 @@
   /// Constructor for class ShutdownOperation.
   ShutdownOperation(Connection &_connection) :
-    Operation(_connection) {}
+    Operation(std::string("shutdown"),_connection) {}
   /// Destructor for class ShutdownOperation
   ~ShutdownOperation() {}