Changeset a636f8 for src

Timestamp:

May 4, 2012, 2:15:41 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:

963c3b

Parents:

2eff32

git-author:

Frederik Heber <heber@…> (11/18/11 20:29:36)

git-committer:

Frederik Heber <heber@…> (05/04/12 14:15:41)

Message:

Took StockClient out of namespace s11n_example.

Location:

src/Fragmentation/Automation

Files:

• StockClient.cpp (modified) (1 diff)
• StockClient.hpp (modified) (3 diffs)
• client.cpp (modified) (1 diff)

src/Fragmentation/Automation/StockClient.cpp

@@ -15 +15 @@
 #include "StockClient.hpp"
 
-namespace s11n_example {
+using namespace s11n_example;
 
-  /// Constructor starts the asynchronous connect operation.
-  StockClient::StockClient(
-      boost::asio::io_service& io_service,
-      const std::string& host,
-      const std::string& service) :
-    connection_(io_service)
+/// Constructor starts the asynchronous connect operation.
+StockClient::StockClient(
+    boost::asio::io_service& io_service,
+    const std::string& host,
+    const std::string& service) :
+  connection_(io_service)
+{
+  // Resolve the host name into an IP address.
+  boost::asio::ip::tcp::resolver resolver(io_service);
+  boost::asio::ip::tcp::resolver::query query(host, service);
+  boost::asio::ip::tcp::resolver::iterator endpoint_iterator =
+    resolver.resolve(query);
+  boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+
+  // Start an asynchronous connect operation.
+  connection_.socket().async_connect(endpoint,
+    boost::bind(&StockClient::handle_connect, this,
+      boost::asio::placeholders::error));
+}
+
+/// Handle completion of a connect operation.
+void StockClient::handle_connect(const boost::system::error_code& e)
+{
+  if (!e)
   {
-    // Resolve the host name into an IP address.
-    boost::asio::ip::tcp::resolver resolver(io_service);
-    boost::asio::ip::tcp::resolver::query query(host, service);
-    boost::asio::ip::tcp::resolver::iterator endpoint_iterator =
-      resolver.resolve(query);
-    boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+    // Successfully established connection. Start operation to read the list
+    // of stocks. The connection::async_read() function will automatically
+    // decode the data that is read from the underlying socket.
+    connection_.async_read(stocks_,
+      boost::bind(&StockClient::handle_read, this,
+      boost::asio::placeholders::error));
+  }
+  else
+  {
+    // An error occurred. Log it and return. Since we are not starting a new
+    // operation the io_service will run out of work to do and the client will
+    // exit.
+    std::cerr << e.message() << std::endl;
+  }
+}
 
-    // Start an asynchronous connect operation.
-    connection_.socket().async_connect(endpoint,
-      boost::bind(&StockClient::handle_connect, this,
-        boost::asio::placeholders::error));
+/// Handle completion of a read operation.
+void StockClient::handle_read(const boost::system::error_code& e)
+{
+  if (!e)
+  {
+    // Print out the data that was received.
+    for (std::size_t i = 0; i < stocks_.size(); ++i)
+    {
+    std::cout << "Stock number " << i << "\n";
+    std::cout << "  code: " << stocks_[i].code << "\n";
+    std::cout << "  name: " << stocks_[i].name << "\n";
+    std::cout << "  open_price: " << stocks_[i].open_price << "\n";
+    std::cout << "  high_price: " << stocks_[i].high_price << "\n";
+    std::cout << "  low_price: " << stocks_[i].low_price << "\n";
+    std::cout << "  last_price: " << stocks_[i].last_price << "\n";
+    std::cout << "  buy_price: " << stocks_[i].buy_price << "\n";
+    std::cout << "  buy_quantity: " << stocks_[i].buy_quantity << "\n";
+    std::cout << "  sell_price: " << stocks_[i].sell_price << "\n";
+    std::cout << "  sell_quantity: " << stocks_[i].sell_quantity << "\n";
+    }
+  }
+  else
+  {
+    // An error occurred.
+    std::cerr << e.message() << std::endl;
   }
 
-  /// Handle completion of a connect operation.
-  void StockClient::handle_connect(const boost::system::error_code& e)
-  {
-    if (!e)
-    {
-      // Successfully established connection. Start operation to read the list
-      // of stocks. The connection::async_read() function will automatically
-      // decode the data that is read from the underlying socket.
-      connection_.async_read(stocks_,
-        boost::bind(&StockClient::handle_read, this,
-        boost::asio::placeholders::error));
-    }
-    else
-    {
-      // An error occurred. Log it and return. Since we are not starting a new
-      // operation the io_service will run out of work to do and the client will
-      // exit.
-      std::cerr << e.message() << std::endl;
-    }
-  }
+  // Since we are not starting a new operation the io_service will run out of
+  // work to do and the client will exit.
+}
 
-  /// Handle completion of a read operation.
-  void StockClient::handle_read(const boost::system::error_code& e)
-  {
-    if (!e)
-    {
-      // Print out the data that was received.
-      for (std::size_t i = 0; i < stocks_.size(); ++i)
-      {
-      std::cout << "Stock number " << i << "\n";
-      std::cout << "  code: " << stocks_[i].code << "\n";
-      std::cout << "  name: " << stocks_[i].name << "\n";
-      std::cout << "  open_price: " << stocks_[i].open_price << "\n";
-      std::cout << "  high_price: " << stocks_[i].high_price << "\n";
-      std::cout << "  low_price: " << stocks_[i].low_price << "\n";
-      std::cout << "  last_price: " << stocks_[i].last_price << "\n";
-      std::cout << "  buy_price: " << stocks_[i].buy_price << "\n";
-      std::cout << "  buy_quantity: " << stocks_[i].buy_quantity << "\n";
-      std::cout << "  sell_price: " << stocks_[i].sell_price << "\n";
-      std::cout << "  sell_quantity: " << stocks_[i].sell_quantity << "\n";
-      }
-    }
-    else
-    {
-      // An error occurred.
-      std::cerr << e.message() << std::endl;
-    }
-
-    // Since we are not starting a new operation the io_service will run out of
-    // work to do and the client will exit.
-  }
-
-} // namespace s11n_example

src/Fragmentation/Automation/StockClient.hpp

@@ -13 +13 @@
 #include "connection.hpp" // Must come before boost/serialization headers.
 #include "stock.hpp"
-
-namespace s11n_example {
 
 /// Downloads stock quote information from a server.
@@ -31 +29 @@
 private:
   /// The connection to the server.
-  connection connection_;
+  s11n_example::connection connection_;
 
   /// The data received from the server.
@@ -37 +35 @@
 };
 
-} // namespace s11n_example
-
 #endif /* STOCKCLIENT_HPP_ */

src/Fragmentation/Automation/client.cpp

@@ -26 +26 @@
 
     boost::asio::io_service io_service;
-    s11n_example::StockClient client(io_service, argv[1], argv[2]);
+    StockClient client(io_service, argv[1], argv[2]);
     io_service.run();
   }