Changeset 1d5a871 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:

076a77

Parents:

c9bc2b7

git-author:

Frederik Heber <heber@…> (01/04/11 12:09:44)

git-committer:

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

Message:

Factored out Factory pattern (no pun intended).

• the Factory pattern half-way residing already in RandomNumberDistribution- and -EngineFactory has been extracted, outsourced into CodePatterns project and is used here.
• same for Creator pattern.
• the prototype problem has not yet been solved.
• FIX: forgot to clean up RandomNumberDistribution- and -EngineFactory instances in cleanUp().
• we now require 1.0.2 of CodePatterns.

Location:

src/RandomNumbers/unittests

Files:

• RandomNumberDistributionFactoryUnitTest.cpp (modified) (2 diffs)
• RandomNumberEngineFactoryUnitTest.cpp (modified) (2 diffs)

src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp

@@ -79 +79 @@
 {
   // check the injectiveness of enum and string map
-  for (RandomNumberDistributionFactory::DistributionNamesMap::const_iterator
-      iter = RandomNumberDistributionFactory::getInstance().distributionNames.begin();
-      iter != RandomNumberDistributionFactory::getInstance().distributionNames.end();
+  for (RandomNumberDistributionFactory::NameMap::const_iterator
+      iter = RandomNumberDistributionFactory::getInstance().names.begin();
+      iter != RandomNumberDistributionFactory::getInstance().names.end();
       ++iter) {
     CPPUNIT_ASSERT_EQUAL(
@@ -96 +96 @@
   RandomNumberDistribution * rnd =
       RandomNumberDistributionFactory::getInstance().
-      DistributionPrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->create();
+      PrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->create();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::uniform_smallint<> ).name()),

src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp

@@ -84 +84 @@
 {
   // check the injectiveness of enum and string map
-  for (RandomNumberEngineFactory::EngineNamesMap::const_iterator
-      iter = RandomNumberEngineFactory::getInstance().engineNames.begin();
-      iter != RandomNumberEngineFactory::getInstance().engineNames.end();
+  for (RandomNumberEngineFactory::NameMap::const_iterator
+      iter = RandomNumberEngineFactory::getInstance().names.begin();
+      iter != RandomNumberEngineFactory::getInstance().names.end();
       ++iter) {
     CPPUNIT_ASSERT_EQUAL(
@@ -101 +101 @@
   RandomNumberEngine* rng =
       RandomNumberEngineFactory::getInstance().
-      EnginePrototypeTable[RandomNumberEngineFactory::minstd_rand0]->create();
+      PrototypeTable[RandomNumberEngineFactory::minstd_rand0]->create();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::minstd_rand0).name()),