Changeset 94605f for src/RandomNumbers

Timestamp:

May 5, 2016, 5:14:19 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Parents:

4a319a

git-author:

Frederik Heber <heber@…> (05/05/16 14:54:56)

git-committer:

Frederik Heber <heber@…> (05/05/16 17:14:19)

Message:

Replaced .. by getConstInstance() wherever possible.

Location:

src/RandomNumbers

Files:

• RandomNumberDistributionFactory.hpp (modified) (1 diff)
• RandomNumberEngineFactory.hpp (modified) (1 diff)
• unittests/RandomNumberDistributionFactoryUnitTest.cpp (modified) (3 diffs)
• unittests/RandomNumberEngineFactoryUnitTest.cpp (modified) (1 diff)
• unittests/RandomNumberGeneratorFactoryUnitTest.cpp (modified) (1 diff)

src/RandomNumbers/RandomNumberDistributionFactory.hpp

@@ -59 +59 @@
   virtual ~RandomNumberDistributionFactory();
 
+  //!> expose namemap
+  using ManipulablePrototypeFactory<RandomNumberDistribution, RandomNumberDistribution_Parameters>::NameMap;
 };
 

src/RandomNumbers/RandomNumberEngineFactory.hpp

@@ -59 +59 @@
   virtual ~RandomNumberEngineFactory();
 
+  //!> expose namemap
+  using ManipulablePrototypeFactory<RandomNumberEngine, RandomNumberEngine_Parameters>::NameMap;
 };
 

src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp

@@ -104 +104 @@
 {
   // check the injectiveness of enum and string map
-  for (RandomNumberDistributionFactory::NameMap::const_iterator
-      iter = RandomNumberDistributionFactory::getInstance().names.begin();
-      iter != RandomNumberDistributionFactory::getInstance().names.end();
+  const RandomNumberDistributionFactory& factory = RandomNumberDistributionFactory::getConstInstance();
+  for (RandomNumberDistributionFactory::NameMap::const_iterator iter =
+      RandomNumberDistributionFactory::names.begin();
+      iter != RandomNumberDistributionFactory::names.end();
       ++iter) {
     CPPUNIT_ASSERT_EQUAL(
         iter->second,
-        RandomNumberDistributionFactory::getInstance().getName(
-            RandomNumberDistributionFactory::getInstance().getEnum(
-                iter->second
-            )
-        )
+        factory.getName( factory.getEnum(iter->second) )
     );
   }
 
   // check one of the distributions in the table
-  rndA = RandomNumberDistributionFactory::getInstance().
-      ManipulablePrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->clone();
+  rndA = RandomNumberDistributionFactory::ManipulablePrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->clone();
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::uniform_smallint<> ).name()),
@@ -129 +125 @@
   CPPUNIT_ASSERT_EQUAL( 0., rndA->min() );
   CPPUNIT_ASSERT_EQUAL( 9., rndA->max() );
+  rndA = NULL;
 }
 
 void RandomNumberDistributionFactoryTest::PrototypeManipulationTest()
 {
+  const RandomNumberDistributionFactory& factory = RandomNumberDistributionFactory::getConstInstance();
   // make unmodified clone
-  rndA_1 = RandomNumberDistributionFactory::getInstance().
-      getProduct(RandomNumberDistributionFactory::uniform_smallint);
+  rndA_1 = factory.getProduct(RandomNumberDistributionFactory::uniform_smallint);
 
   // do something with the prototype
@@ -157 +154 @@
       manipulatePrototype(std::string("uniform_smallint"), *params);
   // ... and check
-  rndA_3 = RandomNumberDistributionFactory::getInstance().
-      getProduct(RandomNumberDistributionFactory::uniform_smallint);
+  rndA_3 = factory.getProduct(RandomNumberDistributionFactory::uniform_smallint);
   CPPUNIT_ASSERT_EQUAL( 25., rndA_3->max());
   CPPUNIT_ASSERT( rndA_1->max() != rndA_3->max());

src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp

@@ -108 +108 @@
 {
   // check the injectiveness of enum and string map
+  const RandomNumberEngineFactory &factory = RandomNumberEngineFactory::getConstInstance();
   for (RandomNumberEngineFactory::NameMap::const_iterator
-      iter = RandomNumberEngineFactory::getInstance().names.begin();
-      iter != RandomNumberEngineFactory::getInstance().names.end();
+      iter = RandomNumberEngineFactory::names.begin();
+      iter != RandomNumberEngineFactory::names.end();
       ++iter) {
     CPPUNIT_ASSERT_EQUAL(
         iter->second,
-        RandomNumberEngineFactory::getInstance().getName(
-            RandomNumberEngineFactory::getInstance().getEnum(
-                iter->second
-            )
-        )
+        factory.getName( factory.getEnum(iter->second) )
     );
   }

src/RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp

@@ -104 +104 @@
 {
   // check one of the engines and distributions
-  RandomNumberGenerator& rng = *(RandomNumberGeneratorFactory::getInstance().
-      GeneratorPrototypeTable[RandomNumberEngineFactory::minstd_rand0]
-                              [RandomNumberDistributionFactory::uniform_smallint]);
+  const RandomNumberGenerator& rng =
+      *RandomNumberGeneratorFactory::GeneratorPrototypeTable[RandomNumberEngineFactory::minstd_rand0]
+                              [RandomNumberDistributionFactory::uniform_smallint];
   CPPUNIT_ASSERT_EQUAL(
       std::string(typeid(boost::minstd_rand0).name()),