Changeset 31ca5f for src

Timestamp:

May 4, 2012, 2:16:02 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:

f93842

Parents:

963c3b

git-author:

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

git-committer:

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

Message:

StockClient and StockServer now exchange FragmentJob's instead of stock's.

• for the moment StockClient is friend of FragmentJob to access contents.

Location:

src

Files:

• Fragmentation/Automation/FragmentJob.cpp (added)
• Fragmentation/Automation/FragmentJob.hpp (added)
• Fragmentation/Automation/Makefile.am (modified) (2 diffs)
• Fragmentation/Automation/StockClient.cpp (modified) (3 diffs)
• Fragmentation/Automation/StockClient.hpp (modified) (2 diffs)
• Fragmentation/Automation/StockServer.cpp (modified) (3 diffs)
• Fragmentation/Automation/StockServer.hpp (modified) (2 diffs)
• Fragmentation/Automation/stock.hpp (deleted)
• unittests/Makefile.am (modified) (2 diffs)

src/Fragmentation/Automation/Makefile.am

@@ -15 +15 @@
   connection.hpp \
   server.cpp \
-  stock.hpp \
+  FragmentJob.cpp \
+  FragmentJob.hpp \
   StockServer.cpp \
   StockServer.hpp
@@ -30 +31 @@
   client.cpp \
   connection.hpp \
-  stock.hpp \
+  FragmentJob.cpp \
+  FragmentJob.hpp \
   StockClient.cpp \
   StockClient.hpp

src/Fragmentation/Automation/StockClient.cpp

@@ -12 +12 @@
 #include "connection.hpp" // Must come before boost/serialization headers.
 #include <boost/serialization/vector.hpp>
-#include "stock.hpp"
+#include "FragmentJob.hpp"
 #include "StockClient.hpp"
 
@@ -43 +43 @@
     // of stocks. The connection::async_read() function will automatically
     // decode the data that is read from the underlying socket.
-    connection_.async_read(stocks_,
+    connection_.async_read(jobs_,
       boost::bind(&StockClient::handle_read, this,
       boost::asio::placeholders::error));
@@ -62 +62 @@
   {
     // Print out the data that was received.
-    for (std::size_t i = 0; i < stocks_.size(); ++i)
+    for (std::size_t i = 0; i < jobs_.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";
+        std::cout << "Job number " << i << "\n";
+        std::cout << "  output: " << jobs_[i].outputfile << "\n";
+        std::cout << "  id: " << jobs_[i].JobId << "\n";
     }
   }

src/Fragmentation/Automation/StockClient.hpp

@@ -12 +12 @@
 #include <vector>
 #include "connection.hpp" // Must come before boost/serialization headers.
-#include "stock.hpp"
+#include "FragmentJob.hpp"
 
 /// Downloads stock quote information from a server.
@@ -33 +33 @@
 
   /// The data received from the server.
-  std::vector<stock> stocks_;
+  std::vector<FragmentJob> jobs_;
 };
 

src/Fragmentation/Automation/StockServer.cpp

@@ -13 +13 @@
 #include "connection.hpp" // Must come before boost/serialization headers.
 #include <boost/serialization/vector.hpp>
-#include "stock.hpp"
+#include "FragmentJob.hpp"
 
 #include "StockServer.hpp"
@@ -22 +22 @@
   )
 {
-  // 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);
+  FragmentJob s(std::string("test"), 1);
+  jobs_.push_back(s);
 
   // Start an accept operation for a new connection.
@@ -62 +40 @@
     // client. The connection::async_write() function will automatically
     // serialize the data structure for us.
-    conn->async_write(stocks_,
+    conn->async_write(jobs_,
       boost::bind(&StockServer::handle_write, this,
       boost::asio::placeholders::error, conn));

src/Fragmentation/Automation/StockServer.hpp

@@ -12 +12 @@
 #include <vector>
 #include "connection.hpp" // Must come before boost/serialization headers.
-#include "stock.hpp"
+#include "FragmentJob.hpp"
 
 /// Serves stock quote information to any client that connects to it.
@@ -33 +33 @@
 
   /// The data to be sent to each client.
-  std::vector<stock> stocks_;
+  std::vector<FragmentJob> jobs_;
 };
 

src/unittests/Makefile.am

@@ -52 +52 @@
         $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIBS) \
         $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LIBS) \
-        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
+        $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
 GENERALLIBS = \
@@ -131 +132 @@
         ../libMolecuilderShapes.la \
         ../libMolecuilderHelpers.la \
-        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la
+        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
+        ${CodePatterns_LIBS}
 
 AtomIdSetUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \