Changeset 73d6fc for src/Fragmentation/Automation/Controller/FragmentController.hpp

Timestamp:

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

167b63

Parents:

1dc209

git-author:

Frederik Heber <heber@…> (12/11/11 16:00:42)

git-committer:

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

Message:

Shifted all Controller stuff into own subfolder, extract class Operation.

• extracted class Operation from FragmentController and place into subfolder Controller/Commands.
• all files containing main() functions are also moved to Controller.

File:

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

src/Fragmentation/Automation/Controller/FragmentController.hpp

@@ -21 +21 @@
 #include "FragmentJob.hpp"
 #include "FragmentResult.hpp"
+
+#include "Controller/Commands/Operation.hpp"
 
 /** The FragmentController sends bunches of jobs to a FragmentScheduler,
@@ -37 +39 @@
   ~FragmentController();
 
-  class Operation {
-  public:
-    Operation(Connection &_connection, const std::string& _host, const std::string& _service);
-    virtual ~Operation();
-  public:
-    /// The Connection to the server.
-    Connection &connection_;
-
-    // virtual function pointer to the operation to do
-    virtual void operator()() = 0;
-
-    /// Handle completion of an operation.
-    void handle_FinishOperation(const boost::system::error_code& e);
-
-    enum Exitflag_t {
-      OkFlag = 0,
-      ErrorFlag = 255
-    };
-
-    // get the exit flag of the last operations
-    size_t getExitflag() const
-    {
-      return Exitflag;
-    }
-
-  protected:
-    /// internal function to resolve host name and ip address
-    boost::asio::ip::tcp::resolver::iterator getEndpointIterator();
-
-    /// internal function to disconnect from server
-    void disconnect();
-
-  protected:
-    /// host name of server
-    const std::string host;
-
-    // service to connect to to
-    const std::string service;
-
-    /// flag of operation to give on program exit
-    enum Exitflag_t Exitflag;
-  };
-
   class ReceiveJobsOperation : public Operation {
   public:
@@ -167 +126 @@
         boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
 
-          /// Callback function when results are about to be received.
-          void handle_ReceivingResults(const boost::system::error_code& e);
-
-          /// Callback function when results have been received.
-          void handle_ReceivedResults(const boost::system::error_code& e);
+    /// Callback function when results are about to be received.
+    void handle_ReceivingResults(const boost::system::error_code& e);
+
+    /// Callback function when results have been received.
+    void handle_ReceivedResults(const boost::system::error_code& e);
 
     /// internal function to connect to server and receive calculated results