Changeset 2614e2a for src/LinkedCell


Ignore:
Timestamp:
Jan 2, 2012, 1:00:05 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:
5dfabd
Parents:
fe8253
git-author:
Frederik Heber <heber@…> (11/30/11 13:10:23)
git-committer:
Frederik Heber <heber@…> (01/02/12 13:00:05)
Message:

LinkedCell_Model now inherits Observer.

  • implemented facade for the three Observer-required functions, also adapted stub.
  • next we need to have the World observe each atom and give Notifications about it. Then, we add each model to this channel and implement the update.
Location:
src/LinkedCell
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/LinkedCell/LinkedCell_Model.cpp

    rfe8253 r2614e2a  
    3030#include "CodePatterns/Info.hpp"
    3131#include "CodePatterns/Log.hpp"
     32#include "CodePatterns/Observer/Observer.hpp"
     33#include "CodePatterns/toString.hpp"
    3234#include "LinearAlgebra/RealSpaceMatrix.hpp"
    3335#include "LinearAlgebra/Vector.hpp"
    … …  
    4749 */
    4850LinkedCell::LinkedCell_Model::LinkedCell_Model(const double radius, const Box &_domain) :
     51    ::Observer(std::string("LinkedCell_Model")+std::string("_")+toString(radius)),
    4952    internal_Sizes(NULL),
    5053    domain(_domain)
    … …  
    5356  NearestNeighbors[0] = NearestNeighbors[1] = NearestNeighbors[2] = 1;
    5457
     58  // get the partition of the domain
    5559  setPartition(radius);
    5660
    … …  
    6670 */
    6771LinkedCell::LinkedCell_Model::LinkedCell_Model(IPointCloud &set, const double radius, const Box &_domain) :
     72    ::Observer(std::string("LinkedCell_Model")+std::string("_")+toString(radius)),
    6873    internal_Sizes(NULL),
    6974    domain(_domain)
    … …  
    387392  return neighbors;
    388393}
     394
     395/** Callback function for Observer mechanism.
     396 *
     397 * @param publisher reference to the Observable that calls
     398 */
     399void LinkedCell::LinkedCell_Model::update(Observable *publisher)
     400{}
     401
     402/** Callback function for the Notifications mechanism.
     403 *
     404 * @param publisher reference to the Observable that calls
     405 * @param notification specific notification as cause of the call
     406 */
     407void LinkedCell::LinkedCell_Model::recieveNotification(Observable *publisher, Notification_ptr notification)
     408{}
     409
     410/** Callback function when an Observer dies.
     411 *
     412 * @param publisher reference to the Observable that calls
     413 */
     414void LinkedCell::LinkedCell_Model::subjectKilled(Observable *publisher)
     415{}
     416

  • src/LinkedCell/LinkedCell_Model.hpp

    rfe8253 r2614e2a  
    1717#include <map>
    1818
     19#include "CodePatterns/Observer/Observer.hpp"
    1920#include "LinearAlgebra/defs.hpp"
    2021#include "LinearAlgebra/RealSpaceMatrix.hpp"
    … …  
    4142   *
    4243   */
    43   class LinkedCell_Model
     44  class LinkedCell_Model : public Observer
    4445  {
    4546    //!> grant unit test access to internal structure
    … …  
    6768    //!> static indices to get nearest neighbors as default argument
    6869    static tripleIndex NearestNeighbors;
     70
     71  protected:
     72    void update(Observable *publisher);
     73    void recieveNotification(Observable *publisher, Notification_ptr notification);
     74    void subjectKilled(Observable *publisher);
    6975
    7076  private:

  • src/LinkedCell/unittests/stubs/LinkedCell_ModelStub.cpp

    rfe8253 r2614e2a  
    2828
    2929#include "Box.hpp"
     30#include "CodePatterns/Observer/Observer.hpp"
    3031#include "LinkedCell/types.hpp"
    3132
    … …  
    4142 */
    4243LinkedCell::LinkedCell_Model::LinkedCell_Model(const double radius, const Box &_domain) :
     44    ::Observer(std::string("LinkedCell_ModelStub")),
    4345    internal_Sizes(NULL),
    4446    domain(_domain)
    … …  
    5355{
    5456}
     57
     58/** Callback function for Observer mechanism.
     59 *
     60 * @param publisher reference to the Observable that calls
     61 */
     62void LinkedCell::LinkedCell_Model::update(Observable *publisher)
     63{}
     64
     65/** Callback function for the Notifications mechanism.
     66 *
     67 * @param publisher reference to the Observable that calls
     68 * @param notification specific notification as cause of the call
     69 */
     70void LinkedCell::LinkedCell_Model::recieveNotification(Observable *publisher, Notification_ptr notification)
     71{}
     72
     73/** Callback function when an Observer dies.
     74 *
     75 * @param publisher reference to the Observable that calls
     76 */
     77void LinkedCell::LinkedCell_Model::subjectKilled(Observable *publisher)
     78{}
     79
Note: See TracChangeset for help on using the changeset viewer.