Changeset 31ca5f for src/Fragmentation/Automation/StockClient.cpp

Timestamp:

May 4, 2012, 2:16:02 PM (14 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, Candidate_v1.7.0, 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.

File:

• src/Fragmentation/Automation/StockClient.cpp (modified) (3 diffs)

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";
     }
   }