Changeset 94605f

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

Files:

• Actions/FragmentationAction/FragmentationAction.cpp (modified) (1 diff)
• Actions/FragmentationAction/StoreSaturatedFragmentAction.cpp (modified) (1 diff)
• Actions/OptionRegistry.cpp (modified) (1 diff)
• Actions/unittests/ActionRegistryUnitTest.cpp (modified) (1 diff)
• Jobs/WindowGrid_converter.cpp (modified) (1 diff)
• Parameters/Validators/Specific/PotentialTypeValidator.cpp (modified) (1 diff)
• Parameters/Validators/Specific/RandomNumberValidators.cpp (modified) (5 diffs)
• Potentials/PotentialSerializer.cpp (modified) (1 diff)
• RandomNumbers/RandomNumberDistributionFactory.hpp (modified) (1 diff)
• RandomNumbers/RandomNumberEngineFactory.hpp (modified) (1 diff)
• RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp (modified) (3 diffs)
• RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp (modified) (1 diff)
• RandomNumbers/unittests/RandomNumberGeneratorFactoryUnitTest.cpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineParser.cpp (modified) (2 diffs)
• UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp (modified) (1 diff)
• UIElements/Menu/Menu.cpp (modified) (1 diff)
• UIElements/Menu/MenuDescription.cpp (modified) (1 diff)
• UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp (modified) (1 diff)
• UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp (modified) (1 diff)
• cleanUp.cpp (modified) (1 diff)

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -79 +79 @@
   clock_t start,end;
   int ExitFlag = -1;
-  World &world = World::getInstance();
+  const World &world = World::getConstInstance();
 
   // inform about used parameters

src/Actions/FragmentationAction/StoreSaturatedFragmentAction.cpp

@@ -57 +57 @@
 /** =========== define the function ====================== */
 ActionState::ptr FragmentationStoreSaturatedFragmentAction::performCall() {
-  World &world = World::getInstance();
+  const World &world = World::getConstInstance();
 
   // check for selected atoms

src/Actions/OptionRegistry.cpp

@@ -99 +99 @@
 void OptionRegistry::ConsistencyCheck()
 {
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator actioniter = tokens.begin();

src/Actions/unittests/ActionRegistryUnitTest.cpp

@@ -73 +73 @@
   std::map <std::string, std::string> result;
 
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/Jobs/WindowGrid_converter.cpp

@@ -267 +267 @@
   griditer = window.Iterators().Local().Begin();
   SamplingGrid::sampledvalues_t::const_iterator copyiter = grid.sampled_grid.begin();
-  const ChargeSmearer &smearer = ChargeSmearer::getInstance();
+  const ChargeSmearer &smearer = ChargeSmearer::getConstInstance();
   // NOTE: GridIterator::operator+=()'s implementation in vmg is broken. DON'T USE!
 //  griditer += pre_offset[0] * total[1] * total[2];

src/Parameters/Validators/Specific/PotentialTypeValidator.cpp

@@ -46 +46 @@
 {
   // add all names from factory
-  const PotentialFactory &factory = PotentialFactory::getInstance();
+  const PotentialFactory &factory = PotentialFactory::getConstInstance();
   for (PotentialTypes t = PotentialTypes_begin;
       t != PotentialTypes_end; ++ t) {

src/Parameters/Validators/Specific/RandomNumberValidators.cpp

@@ -47 +47 @@
 bool RandomNumberDistributionNameValidator::isValid(const std::string & _value) const
 {
-  RandomNumberDistributionFactory::getInstance();
+  RandomNumberDistributionFactory::getConstInstance();
   for (RandomNumberDistributionFactory::NameMap::const_iterator
-      iter = RandomNumberDistributionFactory::getInstance().names.begin();
-      iter != RandomNumberDistributionFactory::getInstance().names.end();
+      iter = RandomNumberDistributionFactory::names.begin();
+      iter != RandomNumberDistributionFactory::names.end();
       ++iter) {
     if (_value == iter->second)
@@ -61 +61 @@
 {
   currentList.clear();
-  RandomNumberDistributionFactory::getInstance();
+  RandomNumberDistributionFactory::getConstInstance();
   for (RandomNumberDistributionFactory::NameMap::const_iterator
-      iter = RandomNumberDistributionFactory::getInstance().names.begin();
-      iter != RandomNumberDistributionFactory::getInstance().names.end();
+      iter = RandomNumberDistributionFactory::names.begin();
+      iter != RandomNumberDistributionFactory::names.end();
       ++iter)
     currentList.push_back(iter->second);
@@ -88 +88 @@
 
 
-
-
-
-
-
-
-
 RandomNumberEngineNameValidator::RandomNumberEngineNameValidator() :
   DiscreteValidator<std::string>(std::vector<std::string>())
@@ -101 +94 @@
 bool RandomNumberEngineNameValidator::isValid(const std::string & _value) const
 {
-  RandomNumberEngineFactory::getInstance();
+  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) {
     if (iter->second == _value)
@@ -115 +108 @@
 {
   currentList.clear();
-  RandomNumberEngineFactory::getInstance();
+  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)
     currentList.push_back(iter->second);

src/Potentials/PotentialSerializer.cpp

@@ -48 +48 @@
 void PotentialSerializer::operator()()
 {
-  PotentialRegistry &instance = PotentialRegistry::getInstance();
+  const PotentialRegistry &instance = PotentialRegistry::getConstInstance();
   for (PotentialRegistry::const_iterator iter = instance.getBeginIter();
       iter != instance.getEndIter(); ++iter)

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()),

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -115 +115 @@
 
   bool ActionAlreadyAdded_flag = false;
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();
@@ -541 +541 @@
   std::map <std::string, std::string> result;
 
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/UIElements/CommandLineUI/unittests/CommandLineParser_ActionRegistry_ConsistencyUnitTest.cpp

@@ -89 +89 @@
 
   // go through all Actions and gather menu names
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/UIElements/Menu/Menu.cpp

@@ -122 +122 @@
 {
   // go through all actions and add those belonging to this menu
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/UIElements/Menu/MenuDescription.cpp

@@ -158 +158 @@
 //  std::multimap <std::string, std::string> result;
 //
-//  ActionQueue &AQ = ActionQueue::getInstance();
+//  const ActionQueue &AQ = ActionQueue::getConstInstance();
 //  ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
 //  for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/UIElements/Menu/unittests/MenuDescription_ActionRegistry_ConsistencyUnitTest.cpp

@@ -81 +81 @@
 
   // go through all Actions and gather menu names
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   ActionQueue::ActionTokens_t tokens = AQ.getListOfActions();
   for (ActionQueue::ActionTokens_t::const_iterator iter = tokens.begin();

src/UIElements/Views/Qt4/QtToolBar_QtFavoriteActions.cpp

@@ -165 +165 @@
   std::multimap<unsigned int, std::string>::const_reverse_iterator iter =
       InvertedCounts.rbegin();
-  ActionQueue &AQ = ActionQueue::getInstance();
+  const ActionQueue &AQ = ActionQueue::getConstInstance();
   const present_actions_t &present_actions = _toolbar.getPresentActions();
   for (size_t added = 0; added<_max; ++iter) {

src/cleanUp.cpp

@@ -175 +175 @@
 {
 //  const MoleCuilder::ActionQueue::ActionTokens_t tokens = MoleCuilder::ActionQueue::getInstance().getListOfActions();
-  const Chronos &Chron = Chronos::getInstance();
+  const Chronos &Chron = Chronos::getConstInstance();
   if (!DoLog(2)) {
     std::cout << "(Non-zero) Times used per Action [seconds]:" << std::endl;