Changeset ecb6c5 for src

Timestamp:

Feb 3, 2011, 9:59:58 AM (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:

5347cd

Parents:

9964ff

git-author:

Frederik Heber <heber@…> (01/07/11 15:36:14)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:59:58)

Message:

min(), max() now implemented for all remaining random number distributions.

• min and max are essential to re-adjust the range. Have been hard-coded from the properties of the distribution if not min(), max() not available.

Location:

src/RandomNumbers

Files:

• RandomNumberDistribution_Encapsulation.cpp (modified) (3 diffs)
• RandomNumberGenerator.hpp (modified) (1 diff)
• RandomNumberGenerator_Encapsulation.hpp (modified) (1 diff)

src/RandomNumbers/RandomNumberDistribution_Encapsulation.cpp

@@ -22 +22 @@
 #include "CodePatterns/MemDebug.hpp"
 
+#include <limits>
+
 #include "RandomNumberDistribution_Encapsulation.hpp"
 
@@ -130 +132 @@
 }
 
-
+template <>
+double RandomNumberDistribution_Encapsulation< boost::bernoulli_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::binomial_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::cauchy_distribution<> >::min() const
+{
+  return std::numeric_limits<double>::min();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::gamma_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::poisson_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::geometric_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::triangle_distribution<> >::min() const
+{
+  return distribution_type.a();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::exponential_distribution<> >::min() const
+{
+  return 0.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::normal_distribution<> >::min() const
+{
+  return std::numeric_limits<double>::min();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::lognormal_distribution<> >::min() const
+{
+  return 0.;
+}
 
 /* ===============  max() ======================= */
@@ -158 +218 @@
 }
 
+template <>
+double RandomNumberDistribution_Encapsulation< boost::bernoulli_distribution<> >::max() const
+{
+  return 1.;
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::binomial_distribution<> >::max() const
+{
+  return distribution_type.t();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::cauchy_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::gamma_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::poisson_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::geometric_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::triangle_distribution<> >::max() const
+{
+  return distribution_type.c();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::exponential_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::normal_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
+
+template <>
+double RandomNumberDistribution_Encapsulation< boost::lognormal_distribution<> >::max() const
+{
+  return std::numeric_limits<double>::max();
+}
 
 /* ===============  p() ======================= */

src/RandomNumbers/RandomNumberGenerator.hpp

@@ -39 +39 @@
   virtual void seed(unsigned int _seed)=0;
 
+  /** Getter for smallest possible random number
+   *
+   * @return smallest possible random number
+   */
+  virtual double min() const=0;
+
+  /** Getter for largest possible random number
+   *
+   * @return largest possible random number
+   */
+  virtual double max() const=0;
+
   /** Getter for the type name of the internal engine.
    *

src/RandomNumbers/RandomNumberGenerator_Encapsulation.hpp

@@ -98 +98 @@
   }
 
+  /** Getter for smallest possible random number
+   *
+   * @return smallest possible random number
+   */
+  double min() const {
+    return distribution_type->min();
+  }
+
+  /** Getter for largest possible random number
+   *
+   * @return largest possible random number
+   */
+  double max() const {
+    return distribution_type->max();
+  }
+
   /** Getter for the type name of the internal engine.
    *