Changeset 6bb605 for src/WorldTime.hpp

Timestamp:

Feb 24, 2011, 4:05:50 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, 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:

d297a3

Parents:

aa04ae

git-author:

Frederik Heber <heber@…> (02/11/11 09:12:36)

git-committer:

Frederik Heber <heber@…> (02/24/11 16:05:50)

Message:

Worldtime now has static CurrentTime and static (inline) getter/setter.

• setter is private such that time is not globally modifiable.
• WorldTime::CurrentTime is now _unsigned_ int.
• TESTFIX: WorldTimeUnitTest also against unsigned ints.

File:

• src/WorldTime.hpp (modified) (3 diffs)

src/WorldTime.hpp

@@ -20 +20 @@
 class WorldTime : public Singleton<WorldTime>
 {
-  //!> unit test should be friend to access private variables
+  //!> own unit test should be friend to access private variables.
   friend class WorldTimeTest;
 
-  //!> Make access to constructor and destructor possible from inside the singleton
+  //!> Make access to constructor and destructor possible from inside the singleton.
   friend class Singleton<WorldTime>;
 
+  //!> Action is granted access to private setter.
+  friend class WorldSetWorldTimeAction;
 public:
 
-  /** Setter for CurrentTime.
-   *
-   * @param _step value to set CurrentTime to
-   */
-  void setTime(int _step);
   /** Getter for CurrentTime.
    *
    * @return CurrentTime
    */
-  int getTime() const;
+  static unsigned int getTime()
+    { return WorldTime::CurrentTime; }
 
   /** Setter for StepWidth.
@@ -43 +41 @@
    * @param _step value to set StepWidth to
    */
-  void setStepWidth(double _width);
+  void setStepWidth(const double _width);
   /** Getter for StepWidth.
    *
@@ -51 +49 @@
 
 private:
-  int CurrentTime;  //!< contains current time step
+  /** Setter for CurrentTime.
+   *
+   * Access to setter is granted to friends only. Time must not be modifiable
+   * globally!
+   *
+   * @param _time value to set CurrentTime to
+   */
+  static void setTime(const unsigned int _time)
+    { WorldTime::CurrentTime = _time; }
+
+  static unsigned int CurrentTime;  //!< contains current time step
   double StepWidth; //!< contains width of one time step in atomic units