Changeset 9b3476 for src/RandomNumbers


Ignore:
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:
15911c
Parents:
076a77
git-author:
Frederik Heber <heber@…> (01/05/11 14:18:11)
git-committer:
Frederik Heber <heber@…> (02/03/11 09:51:19)
Message:

RandomNumberDistribution and RandomNumberEngine inherit Clone instead of Creator, ...Factory are Prototype Factory.

Location:
src/RandomNumbers
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • src/RandomNumbers/RandomNumberDistributionFactory.cpp

    r076a77 r9b3476  
    4545#include "RandomNumberDistributionFactory.hpp"
    4646
    47 // has to be included BEFORE Factory_impl.hpp!
     47// has to be included BEFORE PrototypeFactory_impl.hpp!
    4848#include "RandomNumberDistributionFactory.def"
    49 #include "CodePatterns/Factory_impl.hpp"
     49#include "CodePatterns/PrototypeFactory_impl.hpp"
    5050
    51 RandomNumberDistributionFactory::RandomNumberDistributionFactory() {}
    52 RandomNumberDistributionFactory::~RandomNumberDistributionFactory() {}
     51RandomNumberDistributionFactory::RandomNumberDistributionFactory()
     52{
     53  FillPrototypeTable();
     54}
     55
     56RandomNumberDistributionFactory::~RandomNumberDistributionFactory()
     57{
     58  EmptyPrototypeTable();
     59}
    5360
    5461CONSTRUCT_SINGLETON(RandomNumberDistributionFactory)
    55 CONSTRUCT_FACTORY(RandomNumberDistribution)
     62CONSTRUCT_PROTOTYPEFACTORY(RandomNumberDistribution)
    5663
    5764#include "RandomNumberDistributionFactory.undef"

  • src/RandomNumbers/RandomNumberDistributionFactory.def

    r076a77 r9b3476  
    2525*/
    2626
     27#define FactoryNAME RandomNumberDistributionFactory
    2728#define Abstract_Interface_Class RandomNumberDistribution
    2829#define Abstract_Encapsulation_Class RandomNumberDistribution_Encapsulation

  • src/RandomNumbers/RandomNumberDistributionFactory.hpp

    r076a77 r9b3476  
    1616#include "CodePatterns/Singleton.hpp"
    1717
    18 // this defines stuff necessary PREVIOUS of Factory.hpp inclusion
     18// this defines stuff necessary PREVIOUS of PrototypeFactory.hpp inclusion
    1919#include "RandomNumberDistributionFactory.def"
    2020#include "CodePatterns/FactoryTypeList.hpp"
    21 #include "CodePatterns/Factory.hpp"
     21#include "RandomNumberDistributionFactory.undef"
     22
     23#include "CodePatterns/PrototypeFactory.hpp"
    2224
    2325#include <map>
    2426
    25 #include "unittests/RandomNumberDistributionFactoryUnitTest.hpp"
    26 
    27 
    2827class RandomNumberDistribution;
     28class RandomNumberDistributionFactoryUnitTest;
    2929
    3030/** This is the abstract factory class for random number distributions.
    … …  
    3939class RandomNumberDistributionFactory :
    4040  public Singleton<RandomNumberDistributionFactory>,
    41   public Factory<RandomNumberDistribution>
     41  public PrototypeFactory<RandomNumberDistribution>
    4242{
    4343  friend class Singleton<RandomNumberDistributionFactory>;
    … …  
    4545
    4646protected:
     47  void FillPrototypeTable();
     48  void EmptyPrototypeTable();
     49
    4750  RandomNumberDistributionFactory();
    4851  virtual ~RandomNumberDistributionFactory();
    … …  
    5053};
    5154
    52 #include "RandomNumberDistributionFactory.undef"
    53 
    5455#endif /* RANDOMNUMBERDISTRIBUTIONFACTORY_HPP_ */

  • src/RandomNumbers/RandomNumberDistributionFactory.undef

    r076a77 r9b3476  
    33#undef type_seq
    44#undef type_seq_size
     5#undef FactoryNAME
    56#undef Abstract_Interface_Class
    67#undef Abstract_Encapsulation_Class

  • src/RandomNumbers/RandomNumberDistribution_Encapsulation.hpp

    r076a77 r9b3476  
    3535#include <boost/random/uniform_smallint.hpp>
    3636
    37 #include "CodePatterns/Creator.hpp"
     37#include "CodePatterns/Clone.hpp"
    3838#include "RandomNumberDistribution.hpp"
     39
     40class RandomNumberDistributionFactory;
    3941
    4042/** Template class that encapsulates the random number distributions from
    … …  
    4850class RandomNumberDistribution_Encapsulation :
    4951  public RandomNumberDistribution,
    50   public Creator<
    51     RandomNumberDistribution,
    52     RandomNumberDistribution_Encapsulation<distribution>
    53   >
     52  public Clone<RandomNumberDistribution>
    5453{
     54    /**
     55     * Factory is friend such that it can access private cstor when filling its
     56     * table
     57     */
     58    friend class RandomNumberDistributionFactory;
     59
    5560public:
    5661
    … …  
    7075  }
    7176
     77  /** Clones the current instance.
     78   *
     79   * Implementation of Clone pattern.
     80   *
     81   * @return interface reference to cloned instance
     82   */
     83  RandomNumberDistribution* clone() const {
     84    RandomNumberDistribution* MyClone = NULL;
     85    MyClone = new RandomNumberDistribution_Encapsulation<distribution>();
     86    return MyClone;
     87  }
     88
     89protected:
    7290  /** Constructor that instantiates a specific random number generator and
    7391   * distribution.

  • src/RandomNumbers/RandomNumberEngine.hpp

    r076a77 r9b3476  
    3030  virtual void seed(unsigned int _seed)=0;
    3131
     32  /** Getter for the generator's seed.
     33   *
     34   * @return _seed seed to set to
     35   */
     36  virtual unsigned int getseed() const = 0;
     37
    3238  /** Getter for the type name of the internal engine.
    3339   *

  • src/RandomNumbers/RandomNumberEngineFactory.cpp

    r076a77 r9b3476  
    4343#include "RandomNumberEngineFactory.hpp"
    4444
    45 // has to be included BEFORE Factory_impl.hpp!
     45// has to be included BEFORE PrototypeFactory_impl.hpp!
    4646#include "RandomNumberEngineFactory.def"
    47 #include "CodePatterns/Factory_impl.hpp"
     47#include "CodePatterns/PrototypeFactory_impl.hpp"
    4848
    49 RandomNumberEngineFactory::RandomNumberEngineFactory() {}
    50 RandomNumberEngineFactory::~RandomNumberEngineFactory() {}
     49RandomNumberEngineFactory::RandomNumberEngineFactory()
     50{
     51  FillPrototypeTable();
     52}
     53
     54RandomNumberEngineFactory::~RandomNumberEngineFactory()
     55{
     56  EmptyPrototypeTable();
     57}
    5158
    5259CONSTRUCT_SINGLETON(RandomNumberEngineFactory)
    53 CONSTRUCT_FACTORY(RandomNumberEngine)
     60CONSTRUCT_PROTOTYPEFACTORY(RandomNumberEngine)
    5461
    5562#include "RandomNumberEngineFactory.undef"

  • src/RandomNumbers/RandomNumberEngineFactory.def

    r076a77 r9b3476  
    4242#define type_seq engine_seq engine_seq_a
    4343
     44#define FactoryNAME RandomNumberEngineFactory
    4445#define Abstract_Interface_Class RandomNumberEngine
    4546#define Abstract_Encapsulation_Class RandomNumberEngine_Encapsulation

  • src/RandomNumbers/RandomNumberEngineFactory.hpp

    r076a77 r9b3476  
    1616#include "CodePatterns/Singleton.hpp"
    1717
    18 // this defines stuff necessary PREVIOUS of Factory.hpp inclusion
     18// this defines stuff necessary PREVIOUS of PrototypeFactory.hpp inclusion
    1919#include "RandomNumberEngineFactory.def"
    2020#include "CodePatterns/FactoryTypeList.hpp"
    21 #include "CodePatterns/Factory.hpp"
     21#include "RandomNumberEngineFactory.undef"
     22
     23#include "CodePatterns/PrototypeFactory.hpp"
    2224
    2325#include <map>
    2426
    25 #include "unittests/RandomNumberEngineFactoryUnitTest.hpp"
     27class RandomNumberEngine;
     28class RandomNumberEngineFactoryUnitTest;
    2629
    27 
    28 class RandomNumberEngine;
    29 
    30 /** This is the abstract factory class for random number engines.
     30/** This is the Prototype factory class for random number engines.
    3131 *
    3232 * The reason for creating the engines as this is that we would like to set
    … …  
    3939class RandomNumberEngineFactory :
    4040  public Singleton<RandomNumberEngineFactory>,
    41   public Factory<RandomNumberEngine>
     41  public PrototypeFactory<RandomNumberEngine>
    4242{
    4343  friend class Singleton<RandomNumberEngineFactory>;
    … …  
    4545
    4646protected:
     47  void FillPrototypeTable();
     48  void EmptyPrototypeTable();
     49
    4750  RandomNumberEngineFactory();
    4851  virtual ~RandomNumberEngineFactory();
    … …  
    5053};
    5154
    52 #include "RandomNumberEngineFactory.undef"
    53 
    5455#endif /* RANDOMNUMBERENGINEFACTORY_HPP_ */

  • src/RandomNumbers/RandomNumberEngineFactory.undef

    r076a77 r9b3476  
    33#undef type_seq
    44#undef type_seq_size
     5#undef FactoryNAME
    56#undef Abstract_Interface_Class
    67#undef Abstract_Encapsulation_Class

  • src/RandomNumbers/RandomNumberEngine_Encapsulation.hpp

    r076a77 r9b3476  
    3131#include <boost/random/xor_combine.hpp>
    3232
    33 #include "CodePatterns/Creator.hpp"
     33#include "CodePatterns/Clone.hpp"
    3434#include "RandomNumberEngine.hpp"
     35
     36class RandomNumberEngineFactory;
    3537
    3638/** Template class that encapsulates the random number engines from
    … …  
    4446class RandomNumberEngine_Encapsulation :
    4547  public RandomNumberEngine,
    46   public Creator<
    47     RandomNumberEngine,
    48     RandomNumberEngine_Encapsulation<engine>
    49   >
     48  public Clone<RandomNumberEngine>
    5049{
     50    /**
     51     * Factory is friend such that it can access private cstor when filling its
     52     * table
     53     */
     54    friend class RandomNumberEngineFactory;
     55
    5156public:
    5257  /** Set the engine's seed.
    … …  
    5560   */
    5661  void seed(unsigned int _seed) {
    57     engine_type.seed(_seed);
     62    value_seed = _seed;
     63    engine_type.seed(value_seed);
     64  }
     65
     66  /** Getter for the engine's seed.
     67   *
     68   * @return seed
     69   */
     70  unsigned int getseed() const {
     71    return value_seed;
    5872  }
    5973
    … …  
    7387  }
    7488
     89  /** Clones the current instance.
     90   *
     91   * Implementation of Clone pattern.
     92   *
     93   * @return interface reference to cloned instance
     94   */
     95  RandomNumberEngine* clone() const {
     96    RandomNumberEngine* MyClone = NULL;
     97    MyClone = new RandomNumberEngine_Encapsulation<engine>();
     98    MyClone->seed(getseed());
     99    return MyClone;
     100  }
     101
     102protected:
    75103  /** Constructor that instantiates a specific random number generator and
    76104   * distribution.
    77105   * @param _engine_type instance of the desired engine
    78106   */
    79   RandomNumberEngine_Encapsulation()
     107  RandomNumberEngine_Encapsulation() :
     108    value_seed(1)
    80109  {}
    81110
    … …  
    86115private:
    87116  engine engine_type;
     117  unsigned int value_seed;
    88118};
    89119

  • src/RandomNumbers/RandomNumberGeneratorFactory.hpp

    r076a77 r9b3476  
    4040  friend class Singleton<RandomNumberGeneratorFactory>;
    4141  friend class RandomNumberGeneratorFactoryTest;
    42 
    43 public:
    4442
    4543protected:

  • src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.cpp

    r076a77 r9b3476  
    2121
    2222#include "RandomNumberDistributionFactoryUnitTest.hpp"
     23
     24#include "RandomNumbers/RandomNumberDistribution.hpp"
    2325#include "RandomNumbers/RandomNumberDistribution_Encapsulation.hpp"
    2426#include "RandomNumbers/RandomNumberDistributionFactory.hpp"
    … …  
    6870void RandomNumberDistributionFactoryTest::setUp()
    6971{
     72  rndA = NULL;
     73  rndA_1 = NULL;
     74  rndA_2 = NULL;
    7075  RandomNumberDistributionFactory::getInstance();
    7176}
    … …  
    7378void RandomNumberDistributionFactoryTest::tearDown()
    7479{
     80  delete rndA;
     81  delete rndA_1;
     82  delete rndA_2;
    7583  RandomNumberDistributionFactory::purgeInstance();
    7684}
    … …  
    94102
    95103  // check one of the distributions in the table
    96   RandomNumberDistribution * rnd =
    97       RandomNumberDistributionFactory::getInstance().
    98       PrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->create();
     104  rndA = RandomNumberDistributionFactory::getInstance().
     105      PrototypeTable[RandomNumberDistributionFactory::uniform_smallint]->clone();
    99106  CPPUNIT_ASSERT_EQUAL(
    100107      std::string(typeid(boost::uniform_smallint<> ).name()),
    101       rnd->name()
     108      rndA->name()
    102109  );
    103   delete rnd;
    104110}
     111

  • src/RandomNumbers/unittests/RandomNumberDistributionFactoryUnitTest.hpp

    r076a77 r9b3476  
    1717#include <cppunit/extensions/HelperMacros.h>
    1818
     19class RandomNumberDistribution;
     20
    1921class RandomNumberDistributionFactoryTest : public CppUnit::TestFixture
    2022{
    … …  
    3032
    3133private:
     34  RandomNumberDistribution * rndA;
     35  RandomNumberDistribution * rndA_1;
     36  RandomNumberDistribution * rndA_2;
    3237};
    3338

  • src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.cpp

    r076a77 r9b3476  
    2626#include "RandomNumberEngineFactoryUnitTest.hpp"
    2727
     28#include "RandomNumbers/RandomNumberEngine.hpp"
    2829#include "RandomNumbers/RandomNumberEngine_Encapsulation.hpp"
    2930#include "RandomNumbers/RandomNumberEngineFactory.hpp"
    … …  
    7374void RandomNumberEngineFactoryTest::setUp()
    7475{
     76  rndA = NULL;
     77  rndA_1 = NULL;
     78  rndA_2 = NULL;
    7579  RandomNumberEngineFactory::getInstance();
    7680}
    … …  
    7882void RandomNumberEngineFactoryTest::tearDown()
    7983{
     84  delete rndA;
     85  delete rndA_1;
     86  delete rndA_2;
    8087  RandomNumberEngineFactory::purgeInstance();
    8188}
    … …  
    99106
    100107  // check one of the engines in the table
    101   RandomNumberEngine* rng =
    102       RandomNumberEngineFactory::getInstance().
    103       PrototypeTable[RandomNumberEngineFactory::minstd_rand0]->create();
     108  rndA = RandomNumberEngineFactory::getInstance().
     109      PrototypeTable[RandomNumberEngineFactory::minstd_rand0]->clone();
    104110  CPPUNIT_ASSERT_EQUAL(
    105111      std::string(typeid(boost::minstd_rand0).name()),
    106       rng->name()
     112      rndA->name()
    107113  );
    108   delete rng;
    109114}
     115

  • src/RandomNumbers/unittests/RandomNumberEngineFactoryUnitTest.hpp

    r076a77 r9b3476  
    1717#include <cppunit/extensions/HelperMacros.h>
    1818
     19class RandomNumberEngine;
     20
    1921class RandomNumberEngineFactoryTest : public CppUnit::TestFixture
    2022{
    … …  
    3032
    3133private:
     34  RandomNumberEngine *rndA;
     35  RandomNumberEngine *rndA_1;
     36  RandomNumberEngine *rndA_2;
    3237};
    3338
Note: See TracChangeset for help on using the changeset viewer.