Changeset 1d5a871 for src/RandomNumbers/RandomNumberDistributionFactory.hpp

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.

File:

• src/RandomNumbers/RandomNumberDistributionFactory.hpp (modified) (3 diffs)

src/RandomNumbers/RandomNumberDistributionFactory.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
+// this defines stuff necessary PREVIOUS of Factory.hpp inclusion
+#include "RandomNumberDistributionFactory.def"
+#include "CodePatterns/FactoryTypeList.hpp"
+#include "CodePatterns/Factory.hpp"
+
 #include <map>
 
-#include "TemplatePowerSetGenerator.hpp"
-#include "RandomNumberDistributionFactory.def"
+#include "unittests/RandomNumberDistributionFactoryUnitTest.hpp"
 
-#include "RandomNumberDistribution_Creator.hpp"
-
-#include "unittests/RandomNumberDistributionFactoryUnitTest.hpp"
 
 class RandomNumberDistribution;
@@ -36 +37 @@
  *
  */
-class RandomNumberDistributionFactory : public Singleton<RandomNumberDistributionFactory>
+class RandomNumberDistributionFactory :
+  public Singleton<RandomNumberDistributionFactory>,
+  public Factory<RandomNumberDistribution>
 {
   friend class Singleton<RandomNumberDistributionFactory>;
   friend class RandomNumberDistributionFactoryTest;
-public:
 
 protected:
@@ -46 +48 @@
   virtual ~RandomNumberDistributionFactory();
 
-public:
-  /** Enumeration of all distribution implemented in random::boost.
-   */
-  enum Distribution {
-BOOST_PP_REPEAT( distribution_seq_size, seqitems_as_enum, distribution_seq)
-  };
-
-  /** Getter for current type of distribution.
-   *
-   * @param enumeration index of distribution
-   * @return reference to copy of distribution
-   */
-  RandomNumberDistribution* getDistribution(enum Distribution distribution_type) const;
-
-  /** Getter for current type of distribution.
-   *
-   * @param name of distribution
-   * @return reference to copy of distribution
-   */
-  RandomNumberDistribution* getDistribution(const std::string distribution_name) const;
-
-  /** Getter for the name of the current type of distribution.
-   *
-   * @return name of distribution
-   */
-  const std::string &getName(enum Distribution distribution_type) const;
-
-  /** Getter for the enumeration index of the current type of distribution.
-   *
-   * @return enum of distribution
-   */
-  enum Distribution getEnum(const std::string distribution_name) const;
-
-
-protected:
-private:
-
-  /** Creates instances of all possible distribution types
-   *  and stores them in \a DistributionPrototypeTable.
-   */
-  void FillPrototypeTable();
-
-  /** Create association for enums to strings and vice versa
-   *  and stores them in \a distributions tables.
-   */
-  void FillEnumTable();
-
-  typedef std::map<
-      std::string,
-      enum Distribution
-      > DistributionMap;
-  typedef std::map<
-      enum Distribution,
-      IRandomNumberDistribution_Creator *
-      > DistributionTable;
-  typedef std::map<
-      enum Distribution,
-      std::string
-      > DistributionNamesMap;
-
-  //static enum Distribution distribution;
-  static DistributionMap distributions;
-  static DistributionTable DistributionPrototypeTable;
-  static DistributionNamesMap distributionNames;
 };