Changeset 6ff0c8 for src

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:

1ee3b8d

Parents:

081e5d

git-author:

Frederik Heber <heber@…> (01/06/11 12:28:31)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:51:19)

Message:

SetRandomNumbersEngineAction now only requires RandomNumberEngineFactory and uses seed.

• requires CodePatterns 1.0.7.
• prototype is manipulated for new seed via ugly const_cast.
• FIX: forgot to undefine engine_seq[_a] in RandomNumberEngineFactory.undef.

Location:

src

Files:

• Actions/RandomNumbersAction/SetRandomNumbersEngineAction.cpp (modified) (3 diffs)
• Actions/RandomNumbersAction/SetRandomNumbersEngineAction.def (modified) (1 diff)
• RandomNumbers/RandomNumberEngine.hpp (modified) (2 diffs)
• RandomNumbers/RandomNumberEngineFactory.hpp (modified) (2 diffs)
• RandomNumbers/RandomNumberEngineFactory.undef (modified) (1 diff)

src/Actions/RandomNumbersAction/SetRandomNumbersEngineAction.cpp

@@ -25 +25 @@
 #include "World.hpp"
 
-#include "RandomNumbers/RandomNumberGeneratorFactory.hpp"
+#include "RandomNumbers/RandomNumberEngine.hpp"
+#include "RandomNumbers/RandomNumberEngineFactory.hpp"
 
 #include <iostream>
@@ -43 +44 @@
   getParametersfromValueStorage();
 
+  // create a new state for undo
   CommandSetRandomNumbersEngineState *state =
       new CommandSetRandomNumbersEngineState(
-          RandomNumberGeneratorFactory::getInstance().getEngineName(),
+          RandomNumberEngineFactory::getInstance().getCurrentTypeName(),
+          RandomNumberEngineFactory::getInstance().getPrototype().getseed(),
           params);
-  RandomNumberGeneratorFactory::getInstance().setEngine(params.engine_type);
+  // set new default
+  RandomNumberEngineFactory::getInstance().setCurrentType(params.engine_type);
+  // set new seed if given, have to use ugly const_cast as prototype is not manipulable
+  if (params.seed != -1) {
+    RandomNumberEngine &engine =
+        const_cast<RandomNumberEngine &>(
+            RandomNumberEngineFactory::getInstance().getPrototype(params.engine_type)
+            );
+    engine.seed(params.seed);
+  }
 
-  DoLog(0) && (Log() << Verbose(0) << "Engine of random number generator is now: "
-      << RandomNumberGeneratorFactory::getInstance().getEngineName() << std::endl);
+  DoLog(0) && (Log() << Verbose(0) << "Default random number engine is now: "
+      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
 
   return Action::state_ptr(state);
@@ -56 +68 @@
 
 Action::state_ptr CommandSetRandomNumbersEngineAction::performUndo(Action::state_ptr _state) {
-  CommandSetRandomNumbersEngineState *state = assert_cast<CommandSetRandomNumbersEngineState*>(_state.get());
+  CommandSetRandomNumbersEngineState *state =
+      assert_cast<CommandSetRandomNumbersEngineState*>(_state.get());
 
+  // create a new state for redo
   CommandSetRandomNumbersEngineState *newstate =
       new CommandSetRandomNumbersEngineState(
-          RandomNumberGeneratorFactory::getInstance().getEngineName(),
+          RandomNumberEngineFactory::getInstance().getCurrentTypeName(),
+          RandomNumberEngineFactory::getInstance().getPrototype().getseed(),
           state->params);
-  RandomNumberGeneratorFactory::getInstance().setEngine(state->old_engine_type);
+  // set new default
+  RandomNumberEngineFactory::getInstance().setCurrentType(state->old_engine_type);
+  RandomNumberEngine &engine = const_cast<RandomNumberEngine &>(
+      RandomNumberEngineFactory::getInstance().getPrototype(state->params.engine_type)
+    );
+  // set new seed if given, have to use ugly const_cast as prototype is not manipulable
+  if (state->params.seed != -1) {
+    engine.seed(state->params.seed);
+  }
 
-  DoLog(0) && (Log() << Verbose(0) << "Engine of random number generator is undone to: "
-      << RandomNumberGeneratorFactory::getInstance().getEngineName() << std::endl);
+  DoLog(0) && (Log() << Verbose(0) << "Default random number engine is undone to: "
+      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
 
   return Action::state_ptr(newstate);

src/Actions/RandomNumbersAction/SetRandomNumbersEngineAction.def

@@ -12 +12 @@
 // ValueStorage by the token "Z" -> first column: int, Z, "Z"
 // "undefine" if no parameters are required, use (NODEFAULT) for each (undefined) default value
-#define paramtypes (std::string)
-#define paramtokens ("set-random-number-engine")
-#define paramdescriptions ("name of the pseudo-random engine from boost::random")
-#undef paramdefaults
-#define paramreferences (engine_type)
+#define paramtypes (std::string)(int)
+#define paramtokens ("set-random-number-engine")("random-number-seed")
+#define paramdescriptions ("name of the pseudo-random engine from boost::random")("seed of the pseudo-random number sequence")
+#define paramdefaults (NODEFAULT)("-1")
+#define paramreferences (engine_type)(seed)
 
-#define statetypes (std::string)
-#define statereferences (old_engine_type)
+#define statetypes (std::string)(int)
+#define statereferences (old_engine_type)(old_seed)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/RandomNumbers/RandomNumberEngine.hpp

@@ -43 +43 @@
   virtual void seed(unsigned int _seed)=0;
 
+  /** Getter for the generator's seed.
+   *
+   * @return _seed seed to set to
+   */
+  virtual unsigned int getseed() const = 0;
+
   /** Getter for smallest value the engine produces.
    *
@@ -72 +78 @@
    */
   RandomNumberEngine() {};
-
-  /** Getter for the generator's seed.
-   *
-   * @note is only used internally for unit test.
-   *
-   * @return _seed seed to set to
-   */
-  virtual unsigned int getseed() const = 0;
 };
 

src/RandomNumbers/RandomNumberEngineFactory.hpp

@@ -27 +27 @@
 class RandomNumberEngine;
 class RandomNumberEngineFactoryUnitTest;
+class CommandSetRandomNumbersEngineAction;
 
 /** This is the Prototype factory class for random number engines.
@@ -43 +44 @@
   friend class Singleton<RandomNumberEngineFactory>;
   friend class RandomNumberEngineFactoryTest;
+  friend class CommandSetRandomNumbersEngineAction;
 
 protected:

src/RandomNumbers/RandomNumberEngineFactory.undef

@@ -1 +1 @@
 #ifdef RANDOMNUMBERENGINEFACTORY_DEF_
 
+#undef engine_seq
+#undef engine_seq_a
 #undef type_seq
 #undef type_seq_size