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

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.cpp (moved) (moved from src/Fragmentation/Automation/FragmentController.cpp ) (7 diffs)

src/Fragmentation/Automation/Controller/FragmentController.cpp

@@ -35 +35 @@
 #include "ControllerChoices.hpp"
 
-#include "FragmentController.hpp"
+#include "Controller/FragmentController.hpp"
+#include "Controller/Commands/Operation.hpp"
 
 /** Constructor of class FragmentController.
@@ -64 +65 @@
 {}
 
-/** Constructor for class Operation.
- *
- * \param _connection connection to operate on
- */
-FragmentController::Operation::Operation(Connection &_connection, const std::string& _host, const std::string& _service) :
-    connection_(_connection),
-    host(_host),
-    service(_service),
-    Exitflag(OkFlag)
-{}
-
-/** Destructor for class Operation.
- *
- */
-FragmentController::Operation::~Operation()
-{}
-
 /** Handle connect operation to receive jobs from controller
  *
@@ -224 +208 @@
 }
 
-/** Callback function when an operation has been completed.
- *
- * \param e error code if something went wrong
- */
-void FragmentController::Operation::handle_FinishOperation(const boost::system::error_code& e)
-{
-  Info info(__FUNCTION__);
-  if (!e)
-  {
-    LOG(1, "INFO: Operation completed.");
-  }
-  else
-  {
-    // An error occurred.
-    Exitflag = ErrorFlag;
-    ELOG(1, e.message());
-  }
-
-  // Since we are not starting a new operation the io_service will run out of
-  // work to do and the client will exit.
-}
-
 /** Callback function when jobs have been sent.
  *
@@ -260 +222 @@
     LOG(1, "INFO: Sending "+toString(jobs.size())+" jobs ...");
     connection_.async_write(jobs,
-      boost::bind(&FragmentController::ReceiveJobsOperation::handle_FinishOperation, this,
+      boost::bind(&ReceiveJobsOperation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   }
@@ -326 +288 @@
     LOG(1, "INFO: Checking number of done jobs ...");
     connection_.async_read(doneJobs,
-      boost::bind(&FragmentController::Operation::handle_FinishOperation, this,
+      boost::bind(&Operation::handle_FinishOperation, this,
       boost::asio::placeholders::error));
   }
@@ -335 +297 @@
     ELOG(1, e.message());
   }
-}
-
-/** Internal function to resolve all possible connection endpoints.
- *
- * \return endpoint iterator of connection
- */
-boost::asio::ip::tcp::resolver::iterator FragmentController::Operation::getEndpointIterator()
-{
-  // Resolve the host name into an IP address.
-  boost::asio::ip::tcp::resolver resolver(connection_.socket().get_io_service());
-  boost::asio::ip::tcp::resolver::query query(host, service);
-  boost::asio::ip::tcp::resolver::iterator endpoint_iterator =
-    resolver.resolve(query);
-
-  return endpoint_iterator;
 }
 
@@ -424 +371 @@
 }
 
-/** Internal function to disconnect connection_ correctly.
- *
- */
-void FragmentController::Operation::disconnect()
-{
-  //connection_.socket().close();
-}
-
 /** Place number of jobs into this controller.
  *