Changeset 040a5c

Timestamp:

Feb 22, 2012, 11:28:52 AM (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:

429069

Parents:

38c5d1

git-author:

Frederik Heber <heber@…> (01/05/12 18:26:00)

git-committer:

Frederik Heber <heber@…> (02/22/12 11:28:52)

Message:

WorldTime is now Observable.

• this is required for the LinkedCell_Controller. It has to know when its models have to be re-initialized because all atoms changed positions.
• WorldTime::setTime() is no more static and his caused changes in all classes that are friend and may use this private function.

Location:

src

Files:

• Actions/WorldAction/SetWorldTimeAction.cpp (modified) (3 diffs)
• World.cpp (modified) (1 diff)
• WorldTime.cpp (modified) (3 diffs)
• WorldTime.hpp (modified) (4 diffs)
• unittests/ListOfBondsUnitTest.cpp (modified) (7 diffs)

src/Actions/WorldAction/SetWorldTimeAction.cpp

@@ -44 +44 @@
   getParametersfromValueStorage();
 
-  WorldTime::setTime(params.newtime);
+  WorldTime::getInstance().setTime(params.newtime);
   LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");
   return Action::state_ptr(UndoState);
@@ -52 +52 @@
   WorldSetWorldTimeState *state = assert_cast<WorldSetWorldTimeState*>(_state.get());
 
-  WorldTime::setTime(state->oldtime);
+  WorldTime::getInstance().setTime(state->oldtime);
   LOG(0, "Current time step is now again: " << WorldTime::getTime() << ".");
 
@@ -61 +61 @@
   WorldSetWorldTimeState *state = assert_cast<WorldSetWorldTimeState*>(_state.get());
 
-  WorldTime::setTime(state->params.newtime);
+  WorldTime::getInstance().setTime(state->params.newtime);
   LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");
 

src/World.cpp

@@ -151 +151 @@
   if (_step != WorldTime::getTime()) {
     // set new time
-    WorldTime::setTime(_step);
+    WorldTime::getInstance().setTime(_step);
     // TODO: removed when BondGraph creates the adjacency
     // 1. remove all of World's molecules

src/WorldTime.cpp

@@ -23 +23 @@
 
 #include "CodePatterns/Log.hpp"
+#include "CodePatterns/Observer/Channels.hpp"
+#include "CodePatterns/Observer/Notification.hpp"
 #include "CodePatterns/Singleton_impl.hpp"
 
@@ -28 +30 @@
 
 WorldTime::WorldTime() :
+  Observable("WorldTime"),
   StepWidth(0.)
-{}
+{
+  // observable stuff
+  Channels *OurChannel = new Channels;
+  NotificationChannels.insert( std::make_pair(this, OurChannel) );
+  // add instance for each notification type
+  for (size_t type = 0; type < NotificationType_MAX; ++type)
+    OurChannel->addChannel(type);
+}
 
 WorldTime::~WorldTime()
-{}
+{
+  // observable stuff
+  std::map<Observable *, Channels*>::iterator iter = NotificationChannels.find(this);
+  delete iter->second;
+  NotificationChannels.erase(iter);
+}
 
 void WorldTime::setStepWidth(const double _width)
@@ -45 +60 @@
 }
 
+void WorldTime::setTime(const unsigned int _time)
+{
+  OBSERVE;
+  NOTIFY(TimeChanged);
+  WorldTime::CurrentTime = _time;
+}
+
 CONSTRUCT_SINGLETON(WorldTime)

src/WorldTime.hpp

@@ -14 +14 @@
 #endif
 
+#include "CodePatterns/Observer/Observable.hpp"
 #include "CodePatterns/Singleton.hpp"
 
@@ -22 +23 @@
 }
 
-class WorldTime : public Singleton<WorldTime>
+class WorldTime : public Singleton<WorldTime>, public Observable
 {
   //!> own unit test should be friend to access private variables.
@@ -38 +39 @@
   friend class MoleCuilder::WorldSetWorldTimeAction;
 public:
+  enum NotificationType {
+    TimeChanged,
+    NotificationType_MAX  // denotes the maximum of available notification types
+  };
 
   /** Getter for CurrentTime.
@@ -65 +70 @@
    * @param _time value to set CurrentTime to
    */
-  static void setTime(const unsigned int _time)
-    { WorldTime::CurrentTime = _time; }
+  void setTime(const unsigned int _time);
 
   static unsigned int CurrentTime;  //!< contains current time step

src/unittests/ListOfBondsUnitTest.cpp

@@ -52 +52 @@
   atom *Walker = NULL;
 
-  WorldTime::setTime(0);
+  WorldTime::getInstance().setTime(0);
 
   // construct element
@@ -362 +362 @@
 
   // add bond
-  WorldTime::setTime(0);
-  Binder = TestMolecule->AddBond(atom1, atom2, 1);
-  CPPUNIT_ASSERT( Binder != NULL );
-  WorldTime::setTime(1);
+  WorldTime::getInstance().setTime(0);
+  Binder = TestMolecule->AddBond(atom1, atom2, 1);
+  CPPUNIT_ASSERT( Binder != NULL );
+  WorldTime::getInstance().setTime(1);
   Binder = TestMolecule->AddBond(atom1, atom2, 1);
   CPPUNIT_ASSERT( Binder != NULL );
@@ -371 +371 @@
   // access test via CurrentTime
   { // time step 0
-    WorldTime::setTime(0);
+    WorldTime::getInstance().setTime(0);
     {
       const BondList& ListOfBonds = atom1->getListOfBonds();
@@ -383 +383 @@
   }
   { // time step 1
-    WorldTime::setTime(1);
+    WorldTime::getInstance().setTime(1);
     {
       const BondList& ListOfBonds = atom1->getListOfBonds();
@@ -393 +393 @@
     }
     CPPUNIT_ASSERT_EQUAL( true, TestMolecule->hasBondStructure() );
-    WorldTime::setTime(0);
+    WorldTime::getInstance().setTime(0);
   }
 
@@ -423 +423 @@
   // check bond if removed from other atom for all time steps
   {
-    WorldTime::setTime(0);
+    WorldTime::getInstance().setTime(0);
     const BondList& ListOfBonds = atom1->getListOfBonds();
     CPPUNIT_ASSERT_EQUAL( (size_t) 0, ListOfBonds.size() );
@@ -429 +429 @@
   }
   {
-    WorldTime::setTime(1);
+    WorldTime::getInstance().setTime(1);
     const BondList& ListOfBonds = atom1->getListOfBonds();
     CPPUNIT_ASSERT_EQUAL( (size_t) 0, ListOfBonds.size() );
     CPPUNIT_ASSERT_EQUAL( false, TestMolecule->hasBondStructure() );
-    WorldTime::setTime(0);
+    WorldTime::getInstance().setTime(0);
   }