Changeset 1d5a871 for src/RandomNumbers/RandomNumberEngineFactory.cpp

Timestamp:

Feb 3, 2011, 9:51:19 AM (15 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, Candidate_v1.7.0, 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.

File:

• src/RandomNumbers/RandomNumberEngineFactory.cpp (modified) (1 diff)

src/RandomNumbers/RandomNumberEngineFactory.cpp

@@ -24 +24 @@
 #include "CodePatterns/Assert.hpp"
 
-#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/preprocessor/punctuation/paren.hpp>
-
-#include "TemplatePowerSetGenerator.hpp"
-#include "EmptyPrototypeTable.hpp"
+#include <boost/nondet_random.hpp>
+#include <boost/random.hpp>
+#include <boost/random/additive_combine.hpp>
+#include <boost/random/discard_block.hpp>
+#include <boost/random/inversive_congruential.hpp>
+#include <boost/random/lagged_fibonacci.hpp>
+#include <boost/random/linear_congruential.hpp>
+#include <boost/random/linear_feedback_shift.hpp>
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/random_number_generator.hpp>
+#include <boost/random/ranlux.hpp>
+#include <boost/random/shuffle_output.hpp>
+#include <boost/random/subtract_with_carry.hpp>
+#include <boost/random/xor_combine.hpp>
 
 #include "RandomNumberEngine_Encapsulation.hpp"
 
 #include "RandomNumberEngineFactory.hpp"
+
+// has to be included BEFORE Factory_impl.hpp!
 #include "RandomNumberEngineFactory.def"
+#include "CodePatterns/Factory_impl.hpp"
 
-//enum RandomNumberEngineFactory::Engine RandomNumberEngineFactory::engine = (enum RandomNumberEngineFactory::Engine) 0;
-RandomNumberEngineFactory::EngineMap RandomNumberEngineFactory::engines;
-RandomNumberEngineFactory::EngineNamesMap RandomNumberEngineFactory::engineNames;
-RandomNumberEngineFactory::EngineTable RandomNumberEngineFactory::EnginePrototypeTable;
-
-
-RandomNumberEngineFactory::RandomNumberEngineFactory()
-{
-  FillEnumTable();
-  FillPrototypeTable();
-}
-
-
-RandomNumberEngineFactory::~RandomNumberEngineFactory()
-{
-  // clear out factories map to allow boost::shared_ptr to do their work (i.e. to release mem)
-  // this is necessary as factories is a object
-  engines.clear();
-  engineNames.clear();
-  EmptyPrototypeTable<EngineTable> (EnginePrototypeTable);
-}
-
-void RandomNumberEngineFactory::FillEnumTable()
-{
-  // insert all known engines
-#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_string_enum_map(~, n, engine_seq, engines)
-#define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(engine_seq)-1 )
-#include BOOST_PP_LOCAL_ITERATE()
-#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_string_enum_map(~, n, engine_seq_a, engines)
-#define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(engine_seq_a)-1 )
-#include BOOST_PP_LOCAL_ITERATE()
-  for (EngineMap::const_iterator iter = engines.begin();
-      iter != engines.end();
-      ++iter) {
-    engineNames.insert(make_pair(iter->second, iter->first));
-  }
-}
-
-void RandomNumberEngineFactory::FillPrototypeTable()
-{
-  // fill EnginePrototypeTable
-#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_key_map(~, n, engine_seq, EnginePrototypeTable, new RandomNumberEngine_Creator< RandomNumberEngine_Encapsulation , boost::, >)
-#define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(engine_seq)-1 )
-#include BOOST_PP_LOCAL_ITERATE()
-#define BOOST_PP_LOCAL_MACRO(n) seqitems_as_enum_key_map(~, n, engine_seq_a, EnginePrototypeTable, new RandomNumberEngine_Creator< RandomNumberEngine_Encapsulation , boost::, >)
-#define BOOST_PP_LOCAL_LIMITS  (0, BOOST_PP_SEQ_SIZE(engine_seq_a)-1 )
-#include BOOST_PP_LOCAL_ITERATE()
-}
-
-RandomNumberEngine* RandomNumberEngineFactory::getEngine(enum Engine engine_type) const
-{
-  return EnginePrototypeTable[engine_type]->create();
-}
-
-RandomNumberEngine* RandomNumberEngineFactory::getEngine(const std::string engine_name) const
-{
-  ASSERT(engines.count(engine_name) != 0,
-      "RandomNumberEngineFactory::getEngine() - engine "+engine_name+" is not registered.");
-  return EnginePrototypeTable[ engines[engine_name] ]->create();
-}
-
-const std::string &RandomNumberEngineFactory::getName(enum Engine engine_type) const
-{
-  return engineNames[engine_type];
-}
-
-enum RandomNumberEngineFactory::Engine RandomNumberEngineFactory::getEnum(const std::string engine_name) const
-{
-  ASSERT(engines.count(engine_name) != 0,
-      "RandomNumberEngineFactory::getEnum() - engine "+engine_name+" is not registered.");
-  return engines[engine_name];
-}
+RandomNumberEngineFactory::RandomNumberEngineFactory() {}
+RandomNumberEngineFactory::~RandomNumberEngineFactory() {}
 
 CONSTRUCT_SINGLETON(RandomNumberEngineFactory)
+CONSTRUCT_FACTORY(RandomNumberEngine)
 
 #include "RandomNumberEngineFactory.undef"