Changeset 0275ad for src/RandomNumbers/unittests

Timestamp:

Feb 3, 2011, 9:59:57 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:

9964ff, c14c78

Parents:

1ee3b8d

git-author:

Frederik Heber <heber@…> (01/07/11 00:15:49)

git-committer:

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

Message:

Final step in Random numbers is done ...

• requires CodePatterns 1.0.7.
• RandomNumberDistributionFactory and RandomNumberEngineFactory are now ManipulablePrototypeFactory's (and ...Engine and ..Distribution_Encapsulation are ManipulableClone's).
• new sets of manipulation parameters RandomNumberDistribution_Parameters and RandomNumberEngine_Parameters.
• added Query for RandomNumberDistribution_Parameters because GUI will need to change for specific parameters depending on selected distribution. ... actually, this happened accidentally and was an enormous amount of work ...
• added string parser for distribution parameters from CommandLine, TextUI and QtUI with boost::tokenizer.
• ValueStorage uses this parser for query and setting of CurrentValue.
• unit tests are working and are doing their job very well (found a bug with clone not using the distriubtion to clone's parameters).
• added PrototypeManipulationTest to engine and distribution factory unit test.
• regression tests with Undo/Redo are done.
• what's missing is an extension of the test of RandomNumberGeneratorFactory.

Location:

src/RandomNumbers/unittests

Files:

• RandomNumberDistributionFactoryUnitTest.cpp (modified) (4 diffs)
• RandomNumberDistributionFactoryUnitTest.hpp (modified) (3 diffs)
• RandomNumberEngineFactoryUnitTest.cpp (modified) (4 diffs)
• RandomNumberEngineFactoryUnitTest.hpp (modified) (3 diffs)

src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp

@@ -73 +73 @@
   rndA_1 = NULL;
   rndA_2 = NULL;
+  rndA_3 = NULL;
   RandomNumberDistributionFactory::getInstance();
 }
@@ -81 +82 @@
   delete rndA_1;
   delete rndA_2;
+  delete rndA_3;
   RandomNumberDistributionFactory::purgeInstance();
 }
@@ -103 +105 @@
   // check one of the distributions in the table
   rndA = RandomNumberDistributionFactory::getInstance().
-      PrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->clone();
+      ManipulablePrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->clone();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::uniform_smallint<> ).name()),
@@ -114 +116 @@
 }
 
+void RandomNumberDistributionFactoryTest::PrototypeManipulationTest()
+{
+  // make unmodified clone
+  rndA_1 = RandomNumberDistributionFactory::getInstance().
+      getProduct(RandomNumberDistributionFactory::uniform_smallint);
+
+  // do something with the prototype
+  RandomNumberDistribution_Parameters *params =
+      rndA_1->getParameterSet();
+  CPPUNIT_ASSERT( 20. != rndA_1->max() );
+  params->max = 20.;
+  RandomNumberDistributionFactory::getInstance().
+      manipulatePrototype(RandomNumberDistributionFactory::uniform_smallint, *params);
+  // ... and check max
+  rndA_2 = RandomNumberDistributionFactory::getInstance().
+      getProduct(RandomNumberDistributionFactory::uniform_smallint);
+  CPPUNIT_ASSERT_EQUAL( 20., rndA_2->max());
+  CPPUNIT_ASSERT( rndA_1->max() != rndA_2->max());
+  // ... and check min (remains the same)
+  CPPUNIT_ASSERT( rndA_1->min() == rndA_2->min());
+
+  // do something with the prototype again
+  params->max = 25.;
+  RandomNumberDistributionFactory::getInstance().
+      manipulatePrototype(std::string("uniform_smallint"), *params);
+  // ... and check
+  rndA_3 = RandomNumberDistributionFactory::getInstance().
+      getProduct(RandomNumberDistributionFactory::uniform_smallint);
+  CPPUNIT_ASSERT_EQUAL( 25., rndA_3->max());
+  CPPUNIT_ASSERT( rndA_1->max() != rndA_3->max());
+  CPPUNIT_ASSERT( rndA_2->max() != rndA_3->max());
+
+  delete params;
+}

src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp

@@ -23 +23 @@
   CPPUNIT_TEST_SUITE( RandomNumberDistributionFactoryTest );
   CPPUNIT_TEST ( DistributionTest );
+  CPPUNIT_TEST ( PrototypeManipulationTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -30 +31 @@
 
   void DistributionTest();
+  void PrototypeManipulationTest();
 
 private:
@@ -35 +37 @@
   RandomNumberDistribution * rndA_1;
   RandomNumberDistribution * rndA_2;
+  RandomNumberDistribution * rndA_3;
 };
 

src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp

@@ -77 +77 @@
   rndA_1 = NULL;
   rndA_2 = NULL;
+  rndA_3 = NULL;
   RandomNumberEngineFactory::getInstance();
 }
@@ -85 +86 @@
   delete rndA_1;
   delete rndA_2;
+  delete rndA_3;
   RandomNumberEngineFactory::purgeInstance();
 }
@@ -107 +109 @@
   // check one of the engines in the table
   rndA = RandomNumberEngineFactory::getInstance().
-      PrototypeTable[RandomNumberEngineFactory::minstd_rand0]->clone();
+      ManipulablePrototypeTable[RandomNumberEngineFactory::minstd_rand0]->clone();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::minstd_rand0).name()),
@@ -117 +119 @@
 }
 
+void RandomNumberEngineFactoryTest::PrototypeManipulationTest()
+{
+  // make unmodified clone
+  rndA_1 = RandomNumberEngineFactory::getInstance().
+      getProduct(RandomNumberEngineFactory::minstd_rand0);
+
+  // obtain manipulator
+  RandomNumberEngine &prototype = RandomNumberEngineFactory::getInstance().
+      getPrototype(RandomNumberEngineFactory::minstd_rand0);
+
+  // change the prototype directly
+  CPPUNIT_ASSERT ( 0 != prototype.getseed() );
+  prototype.seed(0);
+
+  // check that prototype has indeed been manipulated
+  rndA_2 = RandomNumberEngineFactory::getInstance().
+      getProduct(RandomNumberEngineFactory::minstd_rand0);
+  CPPUNIT_ASSERT_EQUAL( (unsigned int)0, rndA_2->getseed() );
+  CPPUNIT_ASSERT( rndA_2->getseed() != rndA_1->getseed());
+
+  // manipulate prototype
+  RandomNumberEngine_Parameters *params = rndA_1->getParameterSet();
+  CPPUNIT_ASSERT ( rndA_1->getseed() != (unsigned int)3 );
+  params->seed = 3;
+  RandomNumberEngineFactory::getInstance().
+        manipulatePrototype(RandomNumberEngineFactory::minstd_rand0, *params);
+
+  //
+  rndA_3 = RandomNumberEngineFactory::getInstance().
+      getProduct(RandomNumberEngineFactory::minstd_rand0);
+  CPPUNIT_ASSERT_EQUAL( (unsigned int)3, rndA_3->getseed() );
+  CPPUNIT_ASSERT( rndA_3->getseed() != rndA_1->getseed());
+
+  delete params;
+}
+

src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp

@@ -23 +23 @@
   CPPUNIT_TEST_SUITE( RandomNumberEngineFactoryTest );
   CPPUNIT_TEST ( EngineTest );
+  CPPUNIT_TEST ( PrototypeManipulationTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -30 +31 @@
 
   void EngineTest();
+  void PrototypeManipulationTest();
 
 private:
@@ -35 +37 @@
   RandomNumberEngine *rndA_1;
   RandomNumberEngine *rndA_2;
+  RandomNumberEngine *rndA_3;
 };