Changeset c9bc2b7 for src/RandomNumbers/unittests

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.

Location:

src/RandomNumbers/unittests

Files:

• Makefile.am (modified) (2 diffs)
• RandomNumberDistributionFactoryUnitTest.cpp (added)
• RandomNumberDistributionFactoryUnitTest.hpp (added)
• RandomNumberEngineFactoryUnitTest.cpp (added)
• RandomNumberEngineFactoryUnitTest.hpp (added)
• RandomNumberGeneratorFactoryUnitTest.cpp (modified) (3 diffs)
• RandomNumberGeneratorFactoryUnitTest.hpp (modified) (3 diffs)
• RandomNumberGeneratorUnitTest.cpp (added)
• RandomNumberGeneratorUnitTest.hpp (added)

src/RandomNumbers/unittests/Makefile.am

@@ -8 +8 @@
 
 TESTS = \
-  RandomNumberGeneratorFactoryUnitTest
+  RandomNumberDistributionFactoryUnitTest \
+  RandomNumberEngineFactoryUnitTest \
+  RandomNumberGeneratorFactoryUnitTest \
+  RandomNumberGeneratorUnitTest
 
 
@@ -31 +34 @@
 PARSERLIBS = ../../Parser/libMolecuilderParser.la
 
+RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        RandomNumberDistributionFactoryUnitTest.cpp \
+        RandomNumberDistributionFactoryUnitTest.hpp \
+        $(srcdir)/../RandomNumberDistributionFactory.cpp \
+        $(srcdir)/../RandomNumberDistributionFactory.hpp
+RandomNumberDistributionFactoryUnitTest_LDADD = ${GSLLIBS}
+
+RandomNumberEngineFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        RandomNumberEngineFactoryUnitTest.cpp \
+        RandomNumberEngineFactoryUnitTest.hpp \
+        $(srcdir)/../RandomNumberEngineFactory.cpp \
+        $(srcdir)/../RandomNumberEngineFactory.hpp
+RandomNumberEngineFactoryUnitTest_LDADD = ${GSLLIBS}
+
 RandomNumberGeneratorFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         RandomNumberGeneratorFactoryUnitTest.cpp \
         RandomNumberGeneratorFactoryUnitTest.hpp \
+        $(srcdir)/../RandomNumberDistributionFactory.cpp \
+        $(srcdir)/../RandomNumberDistributionFactory.hpp \
+        $(srcdir)/../RandomNumberEngineFactory.cpp \
+        $(srcdir)/../RandomNumberEngineFactory.hpp \
         $(srcdir)/../RandomNumberGeneratorFactory.cpp \
         $(srcdir)/../RandomNumberGeneratorFactory.hpp
 RandomNumberGeneratorFactoryUnitTest_LDADD = ${GSLLIBS}
 
+RandomNumberGeneratorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        RandomNumberGeneratorUnitTest.cpp \
+        RandomNumberGeneratorUnitTest.hpp \
+        $(srcdir)/../RandomNumberDistributionFactory.cpp \
+        $(srcdir)/../RandomNumberDistributionFactory.hpp \
+        $(srcdir)/../RandomNumberEngineFactory.cpp \
+        $(srcdir)/../RandomNumberEngineFactory.hpp \
+        $(srcdir)/../RandomNumberGeneratorFactory.cpp \
+        $(srcdir)/../RandomNumberGeneratorFactory.hpp
+RandomNumberGeneratorUnitTest_LDADD = ${GSLLIBS}
+
 
 #AUTOMAKE_OPTIONS = parallel-tests

src/RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp

@@ -9 +9 @@
  * RandomNumberGeneratorFactoryUnitTest.cpp
  *
- *  Created on: Dec 31, 2010
+ *  Created on: Jan 03, 2011
  *      Author: heber
  */
@@ -26 +26 @@
 #include "RandomNumberGeneratorFactoryUnitTest.hpp"
 
-#include "RandomNumbers/RandomNumberDistribution_Encapsulation.hpp"
-#include "RandomNumbers/RandomNumberEngine_Encapsulation.hpp"
-#include "RandomNumbers/RandomNumberGenerator_Encapsulation.hpp"
+#include "RandomNumbers/RandomNumberGenerator.hpp"
+#include "RandomNumbers/RandomNumberEngineFactory.hpp"
+#include "RandomNumbers/RandomNumberDistributionFactory.hpp"
 #include "RandomNumbers/RandomNumberGeneratorFactory.hpp"
 
@@ -80 +80 @@
 void RandomNumberGeneratorFactoryTest::tearDown()
 {
+  RandomNumberDistributionFactory::purgeInstance();
+  RandomNumberEngineFactory::purgeInstance();
   RandomNumberGeneratorFactory::purgeInstance();
-}
-
-void RandomNumberGeneratorFactoryTest::EngineTest()
-{
-  // check default value
-  CPPUNIT_ASSERT_EQUAL(
-      std::string("minstd_rand0"),
-      RandomNumberGeneratorFactory::getInstance().getEngine());
-
-  // check one of the engines in the table
-  CPPUNIT_ASSERT_EQUAL(
-      std::string(typeid(boost::minstd_rand0).name()),
-      RandomNumberGeneratorFactory::getInstance().
-            EnginePrototypeTable[RandomNumberGeneratorFactory::minstd_rand0]->name()
-  );
-}
-
-void RandomNumberGeneratorFactoryTest::DistributionTest()
-{
-  // check default value
-  CPPUNIT_ASSERT_EQUAL(
-      std::string("uniform_smallint"),
-      RandomNumberGeneratorFactory::getInstance().getDistribution());
-
-  // check one of the distributions in the table
-  CPPUNIT_ASSERT_EQUAL(
-      std::string(typeid(boost::uniform_smallint<> ).name()),
-      RandomNumberGeneratorFactory::getInstance().
-            DistributionPrototypeTable[RandomNumberGeneratorFactory::uniform_smallint]->name()
-  );
 }
 
 void RandomNumberGeneratorFactoryTest::GeneratorTest()
 {
+  RandomNumberGenerator *rng = NULL;
   // check one of the engines and distributions
+  rng = RandomNumberGeneratorFactory::getInstance().
+      GeneratorPrototypeTable[RandomNumberEngineFactory::minstd_rand0]
+                              [RandomNumberDistributionFactory::uniform_smallint]->create();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::minstd_rand0).name()),
-      RandomNumberGeneratorFactory::getInstance().
-            GeneratorPrototypeTable[RandomNumberGeneratorFactory::minstd_rand0][RandomNumberGeneratorFactory::uniform_smallint]
-                                                                                ->EngineName()
+      rng->EngineName()
   );
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::uniform_smallint<> ).name()),
-      RandomNumberGeneratorFactory::getInstance().
-            GeneratorPrototypeTable[RandomNumberGeneratorFactory::minstd_rand0][RandomNumberGeneratorFactory::uniform_smallint]
-                                                                                ->DistributionName()
+      rng->DistributionName()
   );
+  delete rng;
 
-  // obtain some random values for uniform_smallint
-  RandomNumberGeneratorFactory::getInstance().setDistribution("uniform_smallint");
-  RandomNumberGenerator &rng = RandomNumberGeneratorFactory::getInstance().makeRandomNumberGenerator();
-  for (size_t i=0; i < 1000; ++i) {
-    const int testint = rng();
-    CPPUNIT_ASSERT_MESSAGE("randon number from uniform_smallint is out of [0:9]!", testint >= 0);
-    CPPUNIT_ASSERT_MESSAGE("randon number from uniform_smallint is out of [0:9]!", testint <= 9);
-  }
 }
 

src/RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.hpp

@@ -2 +2 @@
  * RandomNumberGeneratorFactoryUnitTest.hpp
  *
- *  Created on: Dec 31, 2010
+ *  Created on: Jan 03, 2011
  *      Author: heber
  */
@@ -20 +20 @@
 {
   CPPUNIT_TEST_SUITE( RandomNumberGeneratorFactoryTest );
-  CPPUNIT_TEST ( EngineTest );
-  CPPUNIT_TEST ( DistributionTest );
   CPPUNIT_TEST ( GeneratorTest );
   CPPUNIT_TEST_SUITE_END();
@@ -29 +27 @@
   void tearDown();
 
-  void EngineTest();
-  void DistributionTest();
   void GeneratorTest();