Changeset 96c83b for src/Fragmentation/Automation/Controller/Commands/Operation.cpp

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:

25b30aa

Parents:

9948a7

git-author:

Frederik Heber <heber@…> (12/11/11 17:14:24)

git-committer:

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

Message:

Neither FragmentController not Operation need host or service as params to Cstor anymore.

• due to the last change these are given directly to Operation::operator(), hence we have removed them from FragmentController's and Operation's cstor.
• removed Operation::getEndpointIterator().
• all small controller executables have been adapted accordingly.

File:

• src/Fragmentation/Automation/Controller/Commands/Operation.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
  * \param _connection connection to operate on
  */
-Operation::Operation(Connection &_connection, const std::string& _host, const std::string& _service) :
+Operation::Operation(Connection &_connection) :
     connection_(_connection),
-    host(_host),
-    service(_service),
     Exitflag(OkFlag)
 {}
@@ -73 +71 @@
 }
 
-/** Internal function to resolve all possible connection endpoints.
- *
- * \return endpoint iterator of connection
- */
-boost::asio::ip::tcp::resolver::iterator 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;
-}
-
 /** Internal function to disconnect connection_ correctly.
  *
@@ -93 +76 @@
 void Operation::disconnect()
 {
-  //connection_.socket().close();
+  connection_.socket().close();
 }