Changeset ed2c5b for src

Timestamp:

May 4, 2012, 2:14:11 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:

8b6572

Parents:

72eaf7f

git-author:

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

git-committer:

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

Message:

Took StockServer out of namespace s11n_example.

Location:

src/Fragmentation/Automation

Files:

• StockServer.cpp (modified) (1 diff)
• StockServer.hpp (modified) (3 diffs)
• server.cpp (modified) (1 diff)

src/Fragmentation/Automation/StockServer.cpp

@@ -17 +17 @@
 #include "StockServer.hpp"
 
-namespace s11n_example {
+using namespace s11n_example;
 
-  StockServer::StockServer(boost::asio::io_service& io_service, unsigned short port) :
-    acceptor_(io_service,
-        boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)
-    )
+StockServer::StockServer(boost::asio::io_service& io_service, unsigned short port) :
+  acceptor_(io_service,
+      boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v4(), port)
+  )
+{
+  // Create the data to be sent to each client.
+  stock s;
+  s.code = "ABC";
+  s.name = "A Big Company";
+  s.open_price = 4.56;
+  s.high_price = 5.12;
+  s.low_price = 4.33;
+  s.last_price = 4.98;
+  s.buy_price = 4.96;
+  s.buy_quantity = 1000;
+  s.sell_price = 4.99;
+  s.sell_quantity = 2000;
+  stocks_.push_back(s);
+  s.code = "DEF";
+  s.name = "Developer Entertainment Firm";
+  s.open_price = 20.24;
+  s.high_price = 22.88;
+  s.low_price = 19.50;
+  s.last_price = 19.76;
+  s.buy_price = 19.72;
+  s.buy_quantity = 34000;
+  s.sell_price = 19.85;
+  s.sell_quantity = 45000;
+  stocks_.push_back(s);
+
+  // Start an accept operation for a new connection.
+  connection_ptr new_conn(new connection(acceptor_.get_io_service()));
+  acceptor_.async_accept(new_conn->socket(),
+    boost::bind(&StockServer::handle_accept, this,
+      boost::asio::placeholders::error, new_conn));
+}
+
+void StockServer::handle_accept(const boost::system::error_code& e, connection_ptr conn)
+{
+  std::cout << "handle_accept called." << std::endl;
+  if (!e)
   {
-    // Create the data to be sent to each client.
-    stock s;
-    s.code = "ABC";
-    s.name = "A Big Company";
-    s.open_price = 4.56;
-    s.high_price = 5.12;
-    s.low_price = 4.33;
-    s.last_price = 4.98;
-    s.buy_price = 4.96;
-    s.buy_quantity = 1000;
-    s.sell_price = 4.99;
-    s.sell_quantity = 2000;
-    stocks_.push_back(s);
-    s.code = "DEF";
-    s.name = "Developer Entertainment Firm";
-    s.open_price = 20.24;
-    s.high_price = 22.88;
-    s.low_price = 19.50;
-    s.last_price = 19.76;
-    s.buy_price = 19.72;
-    s.buy_quantity = 34000;
-    s.sell_price = 19.85;
-    s.sell_quantity = 45000;
-    stocks_.push_back(s);
+    // Successfully accepted a new connection. Send the list of stocks to the
+    // client. The connection::async_write() function will automatically
+    // serialize the data structure for us.
+    conn->async_write(stocks_,
+      boost::bind(&StockServer::handle_write, this,
+      boost::asio::placeholders::error, conn));
+}
 
-    // Start an accept operation for a new connection.
-    connection_ptr new_conn(new connection(acceptor_.get_io_service()));
-    acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&StockServer::handle_accept, this,
-        boost::asio::placeholders::error, new_conn));
-  }
+  connection_ptr new_conn(new connection(acceptor_.get_io_service()));
+  acceptor_.async_accept(new_conn->socket(),
+    boost::bind(&StockServer::handle_accept, this,
+      boost::asio::placeholders::error, new_conn));
+}
 
-  void StockServer::handle_accept(const boost::system::error_code& e, connection_ptr conn)
-  {
-    std::cout << "handle_accept called." << std::endl;
-    if (!e)
-    {
-      // Successfully accepted a new connection. Send the list of stocks to the
-      // client. The connection::async_write() function will automatically
-      // serialize the data structure for us.
-      conn->async_write(stocks_,
-        boost::bind(&StockServer::handle_write, this,
-        boost::asio::placeholders::error, conn));
-  }
-
-    connection_ptr new_conn(new connection(acceptor_.get_io_service()));
-    acceptor_.async_accept(new_conn->socket(),
-      boost::bind(&StockServer::handle_accept, this,
-        boost::asio::placeholders::error, new_conn));
-  }
-
-  void StockServer::handle_write(const boost::system::error_code& e, connection_ptr conn)
-  {
-    // Nothing to do. The socket will be closed automatically when the last
-    // reference to the connection object goes away.
-  }
-
-} // namespace s11n_example
+void StockServer::handle_write(const boost::system::error_code& e, connection_ptr conn)
+{
+  // Nothing to do. The socket will be closed automatically when the last
+  // reference to the connection object goes away.
+}

src/Fragmentation/Automation/StockServer.hpp

@@ -14 +14 @@
 #include "stock.hpp"
 
-namespace s11n_example {
-
 /// Serves stock quote information to any client that connects to it.
 class StockServer
@@ -25 +23 @@
 
   /// Handle completion of a accept operation.
-  void handle_accept(const boost::system::error_code& e, connection_ptr conn);
+  void handle_accept(const boost::system::error_code& e, s11n_example::connection_ptr conn);
 
   /// Handle completion of a write operation.
-  void handle_write(const boost::system::error_code& e, connection_ptr conn);
+  void handle_write(const boost::system::error_code& e, s11n_example::connection_ptr conn);
 
 private:
@@ -35 +33 @@
 
   /// The data to be sent to each client.
-  std::vector<stock> stocks_;
+  std::vector<s11n_example::stock> stocks_;
 };
 
-} // namespace s11n_example
-
 #endif /* STOCKSERVER_HPP_ */

src/Fragmentation/Automation/server.cpp

@@ -28 +28 @@
 
     boost::asio::io_service io_service;
-    s11n_example::StockServer server(io_service, port);
+    StockServer server(io_service, port);
     io_service.run();
   }