Changeset 9b3476 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:

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.

• requires CodePatterns 1.0.5.
• RandomNumberDistribution inherits Clone<> and implements a clone() function.
• RandomNumberEngine inherits Clone<> and implements a clone() function.
• that is RandomNumberGenerator clones can from now on be directly manipulated via prototypes in RandomNumberEngineFactory and RandomNumberDistributionFactory.
• Removed PrototypeManipulationTest() from Engine and DistributionFactoryUnitTest.

File:

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

src/RandomNumbers/RandomNumberDistributionFactory.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
-// this defines stuff necessary PREVIOUS of Factory.hpp inclusion
+// this defines stuff necessary PREVIOUS of PrototypeFactory.hpp inclusion
 #include "RandomNumberDistributionFactory.def"
 #include "CodePatterns/FactoryTypeList.hpp"
-#include "CodePatterns/Factory.hpp"
+#include "RandomNumberDistributionFactory.undef"
+
+#include "CodePatterns/PrototypeFactory.hpp"
 
 #include <map>
 
-#include "unittests/RandomNumberDistributionFactoryUnitTest.hpp"
-
-
 class RandomNumberDistribution;
+class RandomNumberDistributionFactoryUnitTest;
 
 /** This is the abstract factory class for random number distributions.
@@ -39 +39 @@
 class RandomNumberDistributionFactory :
   public Singleton<RandomNumberDistributionFactory>,
-  public Factory<RandomNumberDistribution>
+  public PrototypeFactory<RandomNumberDistribution>
 {
   friend class Singleton<RandomNumberDistributionFactory>;
@@ -45 +45 @@
 
 protected:
+  void FillPrototypeTable();
+  void EmptyPrototypeTable();
+
   RandomNumberDistributionFactory();
   virtual ~RandomNumberDistributionFactory();
@@ -50 +53 @@
 };
 
-#include "RandomNumberDistributionFactory.undef"
-
 #endif /* RANDOMNUMBERDISTRIBUTIONFACTORY_HPP_ */