Changeset c9bc2b7 for src/RandomNumbers/RandomNumberGenerator_Encapsulation.hpp

Timestamp:

Feb 3, 2011, 9:51:19 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:

1d5a871

Parents:

3f9eba

git-author:

Frederik Heber <heber@…> (01/03/11 14:01:22)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:51:19)

Message:

Bigger rewrite of RandomNumbers ... due to cloning of prototypes.

• in order to copy the prototypes and not use the original instance, we have implemented a new pattern called "Creator" that wraps a templated class in a creation interface class such that this abstract class can instaniate the particular types (see here ​http://stackoverflow.com/questions/3506026/c-clone-abstract-base-class-without-meddling-with-derived). This is also wrapped up in ..._Creator.hpp files.
• meanwhile we also tried to have factories for Engine and Distribution but this failed due to boost::variate_operator<> having to know the particular types of engine and distribution. One could go forth with some cast's but this is very unclean and not what we want. ... Downside is that we can't set global options for engines or distributions as of now.
• For the moment Engine- and DistributionFactory both have a prototype table, i.e. the same wrapped ones as above, but they are not used for the GeneratorFactory.

• For all we have written unit tests:
  • RandomNumberDistributionFactory
  • RandomNumberEngineFactory
  • RandomNumberGeneratorFactory
  • RandomNumberGenerator The last one especially checks that two given generators are independent, i.e. first call produce the same number from the pseudo-random number sequence.

File:

• src/RandomNumbers/RandomNumberGenerator_Encapsulation.hpp (modified) (7 diffs)

src/RandomNumbers/RandomNumberGenerator_Encapsulation.hpp

@@ -14 +14 @@
 #endif
 
-#include "RandomNumberDistribution.hpp"
-#include "RandomNumberEngine.hpp"
+#include <boost/nondet_random.hpp>
+#include <boost/random.hpp>
+#include <boost/random/bernoulli_distribution.hpp>
+#include <boost/random/binomial_distribution.hpp>
+#include <boost/random/cauchy_distribution.hpp>
+#include <boost/random/exponential_distribution.hpp>
+#include <boost/random/gamma_distribution.hpp>
+#include <boost/random/geometric_distribution.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/lognormal_distribution.hpp>
+#include <boost/random/normal_distribution.hpp>
+#include <boost/random/poisson_distribution.hpp>
+#include <boost/random/triangle_distribution.hpp>
+#include <boost/random/uniform_01.hpp>
+#include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_on_sphere.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/uniform_smallint.hpp>
+#include <boost/random/additive_combine.hpp>
+#include <boost/random/discard_block.hpp>
+#include <boost/random/inversive_congruential.hpp>
+#include <boost/random/lagged_fibonacci.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/linear_feedback_shift.hpp>
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/random_number_generator.hpp>
+#include <boost/random/ranlux.hpp>
+#include <boost/random/shuffle_output.hpp>
+#include <boost/random/subtract_with_carry.hpp>
+#include <boost/random/xor_combine.hpp>
+#include <boost/random/variate_generator.hpp>
+
+#include <typeinfo>
+
+#include "RandomNumberGenerator_Creator.hpp"
 #include "RandomNumberGenerator.hpp"
+
 #include "RandomNumberGeneratorFactory.hpp"
-
 #include "unittests/RandomNumberGeneratorFactoryUnitTest.hpp"
 
@@ -36 +69 @@
  */
 template <class engine, class distribution>
-class RandomNumberGenerator_Encapsulation : public RandomNumberGenerator
+class RandomNumberGenerator_Encapsulation : public RandomNumberGenerator, public RandomNumberGenerator_Creator< RandomNumberGenerator_Encapsulation<engine, distribution> >
 {
   /**
@@ -43 +76 @@
   friend class RandomNumberGeneratorFactory;
   friend class RandomNumberGeneratorFactoryTest;
+
+  friend class RandomNumberGenerator_Creator< RandomNumberGenerator_Encapsulation<engine, distribution> >;
 
 public:
@@ -64 +99 @@
    */
   std::string EngineName() {
-    return engine_type.name();
+    return typeid(engine_type).name();
   }
 
@@ -71 +106 @@
    */
   std::string DistributionName() {
-    return distribution_type.name();
+    return typeid(distribution_type).name();
   }
 
+protected:
   /** Constructor that instantiates a specific random number generator and
    * distribution.
@@ -79 +115 @@
    * @param _distribution_type instance of the desired distribution
    */
-  RandomNumberGenerator_Encapsulation(
-      RandomNumberEngine &_engine_type,
-      RandomNumberDistribution &_distribution_type
-      ) :
-    engine_type(static_cast<RandomNumberEngine_Encapsulation<engine> &>(_engine_type)),
-    distribution_type(static_cast<RandomNumberDistribution_Encapsulation<distribution> &>(_distribution_type)),
-    randomgenerator(boost::variate_generator<engine, distribution> (
-        engine_type.getEngine(),
-        distribution_type.getDistribution()
-        ))
+  RandomNumberGenerator_Encapsulation() :
+    randomgenerator(
+        boost::variate_generator<engine, distribution> (
+            engine_type,
+            distribution_type)
+        )
   {
     // note that we instantiate the variate_generator with the copied instances!
@@ -96 +128 @@
    *
    */
-  ~RandomNumberGenerator_Encapsulation() {}
+  virtual ~RandomNumberGenerator_Encapsulation() {}
 private:
-  RandomNumberEngine_Encapsulation<engine> engine_type;
-  RandomNumberDistribution_Encapsulation<distribution> distribution_type;
+  engine engine_type;
+  distribution distribution_type;
   mutable boost::variate_generator<engine, distribution> randomgenerator;
 };