Changeset 2e661a for src/Fragmentation

Timestamp:

Jul 2, 2012, 7:54:13 AM (12 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:

f45c08

Parents:

86a1e8

git-author:

Frederik Heber <heber@…> (04/24/12 14:35:21)

git-committer:

Frederik Heber <heber@…> (07/02/12 07:54:13)

Message:

AsyncOperation is now an Observable.

• it gives update() when the operation has been completed.
• this is preparatory to placing AsyncOperation inside a queue that automatically takes care of their removal.

Location:

src/Fragmentation/Automation/Operations

Files:

• AsyncOperation.cpp (modified) (1 diff)
• AsyncOperation.hpp (modified) (2 diffs)

src/Fragmentation/Automation/Operations/AsyncOperation.cpp

@@ -60 +60 @@
 void AsyncOperation::disconnect()
 {
+  OBSERVE;
+  // close the socket
   connection_.socket().close();
 }

src/Fragmentation/Automation/Operations/AsyncOperation.hpp

@@ -15 +15 @@
 
 #include <boost/asio.hpp>
+#include <boost/function.hpp>
+#include <functional>
 #include <string>
 #include <vector>
 
+#include "CodePatterns/Observer/Observable.hpp"
+
 #include "Operation.hpp"
 
-class AsyncOperation : public Operation {
+/** This class represents an asynchronous operation that is initiated by
+ * calling AsyncOperation::operator() and gives an update with the Observer
+ * construct when the operation has finished.
+ *
+ * \note Make sure that deriving classes still end the asynchronous operation
+ * chain by calling AsyncOperation::handle_FinishOperation(). Otherwise the
+ * update signal at operation's end is not triggered.
+ */
+class AsyncOperation : public Operation, public Observable {
 public:
   /** Constructor for class AsyncOperation.
@@ -27 +39 @@
    * \param _connection connection to operate on
    */
-  AsyncOperation(const std::string &_name, Connection &_connection) :
-    Operation(_name, _connection)
+  AsyncOperation(
+      const std::string &_name,
+      Connection &_connection) :
+    Operation(_name, _connection),
+    Observable(_name)
   {}