Changeset 0275ad for src/Actions/RandomNumbersAction

Timestamp:

Feb 3, 2011, 9:59:57 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:

9964ff, c14c78

Parents:

1ee3b8d

git-author:

Frederik Heber <heber@…> (01/07/11 00:15:49)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:59:57)

Message:

Final step in Random numbers is done ...

• requires CodePatterns 1.0.7.
• RandomNumberDistributionFactory and RandomNumberEngineFactory are now ManipulablePrototypeFactory's (and ...Engine and ..Distribution_Encapsulation are ManipulableClone's).
• new sets of manipulation parameters RandomNumberDistribution_Parameters and RandomNumberEngine_Parameters.
• added Query for RandomNumberDistribution_Parameters because GUI will need to change for specific parameters depending on selected distribution. ... actually, this happened accidentally and was an enormous amount of work ...
• added string parser for distribution parameters from CommandLine, TextUI and QtUI with boost::tokenizer.
• ValueStorage uses this parser for query and setting of CurrentValue.
• unit tests are working and are doing their job very well (found a bug with clone not using the distriubtion to clone's parameters).
• added PrototypeManipulationTest to engine and distribution factory unit test.
• regression tests with Undo/Redo are done.
• what's missing is an extension of the test of RandomNumberGeneratorFactory.

Location:

src/Actions/RandomNumbersAction

Files:

• SetRandomNumbersDistributionAction.cpp (modified) (3 diffs)
• SetRandomNumbersDistributionAction.def (modified) (1 diff)
• SetRandomNumbersEngineAction.cpp (modified) (3 diffs)
• SetRandomNumbersEngineAction.def (modified) (1 diff)

src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp

@@ -25 +25 @@
 #include "World.hpp"
 
-#include "RandomNumbers/RandomNumberGeneratorFactory.hpp"
+#include "RandomNumbers/RandomNumberDistributionFactory.hpp"
+#include "RandomNumbers/RandomNumberDistribution.hpp"
+#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
 
 #include <iostream>
@@ -43 +45 @@
   getParametersfromValueStorage();
 
-  CommandSetRandomNumbersDistributionState *state =
-      new CommandSetRandomNumbersDistributionState(
-          RandomNumberGeneratorFactory::getInstance().getDistributionName(),
-          params);
-  RandomNumberGeneratorFactory::getInstance().setDistribution(params.distribution_type);
+  // note down old type
+  std::string oldtype = RandomNumberDistributionFactory::getInstance().getCurrentTypeName();
+  DoLog(1) && (Log() << Verbose(1) << "Current distribution is " << oldtype << std::endl);
 
+  // set the new default
+  RandomNumberDistributionFactory::getInstance().setCurrentType(params.distribution_type);
   DoLog(0) && (Log() << Verbose(0) << "Distribution of random number generator is now: "
-      << RandomNumberGeneratorFactory::getInstance().getDistributionName() << std::endl);
+      << RandomNumberDistributionFactory::getInstance().getCurrentTypeName() << std::endl);
 
-  return Action::state_ptr(state);
+  // note down old parameters
+  RandomNumberDistribution_Parameters *oldparameters =
+      RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+  // set each parameter (that is not -1);
+  if (!params.parameters.isDefault()) {
+    RandomNumberDistribution_Parameters *oldparameters =
+        RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+    oldparameters->update(params.parameters);
+    DoLog(1) && (Log() << Verbose(1) << "Changing prototype's parameters to "
+        << params.parameters << "." << std::endl);
+    RandomNumberDistributionFactory::getInstance().manipulatePrototype(*oldparameters);
+  }
+
+  {
+    RandomNumberDistribution_Parameters *currentparameters =
+        RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+    DoLog(1) && (Log() << Verbose(1) << "Its parameters are: " << *currentparameters << std::endl);
+    delete  currentparameters;
+  }
+
+  CommandSetRandomNumbersDistributionState *newstate =
+      new CommandSetRandomNumbersDistributionState(oldtype,*oldparameters,params);
+  delete oldparameters;
+  return Action::state_ptr(newstate);
 }
 
@@ -58 +83 @@
   CommandSetRandomNumbersDistributionState *state = assert_cast<CommandSetRandomNumbersDistributionState*>(_state.get());
 
+  // note down old type for redo
+  std::string newtype = RandomNumberDistributionFactory::getInstance().getCurrentTypeName();
+  DoLog(1) && (Log() << Verbose(1) << "Newly set distribution was " << newtype << std::endl);
+
+  // note down old parameters for redo
+  RandomNumberDistribution_Parameters *newparameters =
+      RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+
+  // set the new default
+  RandomNumberDistributionFactory::getInstance().setCurrentType(state->old_distribution_type);
+  DoLog(0) && (Log() << Verbose(0) << "Distribution of random number generator is again: "
+      << RandomNumberDistributionFactory::getInstance().getCurrentTypeName() << std::endl);
+
+  // set each parameter back (that is not -1);
+  if (!state->old_parameters.isDefault()) {
+    DoLog(1) && (Log() << Verbose(1) << "Changing back prototype's parameters to "
+        << state->old_parameters << "." << std::endl);
+    RandomNumberDistributionFactory::getInstance().manipulatePrototype(state->old_parameters);
+  }
+
+  {
+    RandomNumberDistribution_Parameters *currentparameters =
+        RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+    DoLog(1) && (Log() << Verbose(1) << "Its parameters are: " << *currentparameters << std::endl);
+    delete  currentparameters;
+  }
+
   CommandSetRandomNumbersDistributionState *newstate =
-      new CommandSetRandomNumbersDistributionState(
-          RandomNumberGeneratorFactory::getInstance().getDistributionName(),
-          state->params);
-  RandomNumberGeneratorFactory::getInstance().setDistribution(state->old_distribution_type);
-
-  DoLog(0) && (Log() << Verbose(0) << "Distribution of random number generator is undone to: "
-      << RandomNumberGeneratorFactory::getInstance().getDistributionName() << std::endl);
-
+      new CommandSetRandomNumbersDistributionState(newtype,*newparameters,params);
+  delete newparameters;
   return Action::state_ptr(newstate);
 }

src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.def

@@ -7 +7 @@
 
 // all includes and forward declarations necessary for non-integral types below
-class MoleculeListClass;
+#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
 
 // i.e. there is an integer with variable name Z that can be found in
 // 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-distribution")
-#define paramdescriptions ("name of the distribution from boost::random")
-#undef paramdefaults
-#define paramreferences (distribution_type)
+#define paramtypes (std::string)(class RandomNumberDistribution_Parameters)
+#define paramtokens ("set-random-number-distribution")("random-number-distribution-parameters")
+#define paramdescriptions ("name of the distribution from boost::random")("parameter set for requested distribution")
+#define paramdefaults (NODEFAULT)("p=-1")
+#define paramreferences (distribution_type)(parameters)
 
-#define statetypes (std::string)
-#define statereferences (old_distribution_type)
+#define statetypes (std::string)(RandomNumberDistribution_Parameters)
+#define statereferences (old_distribution_type)(old_parameters)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/RandomNumbersAction/SetRandomNumbersEngineAction.cpp

@@ -26 +26 @@
 
 #include "RandomNumbers/RandomNumberEngine.hpp"
+#include "RandomNumbers/RandomNumberEngine_Parameters.hpp"
 #include "RandomNumbers/RandomNumberEngineFactory.hpp"
 
 #include <iostream>
-#include <fstream>
+#include <sstream>
 #include <string>
 
@@ -44 +45 @@
   getParametersfromValueStorage();
 
-  // create a new state for undo
-  CommandSetRandomNumbersEngineState *state =
-      new CommandSetRandomNumbersEngineState(
-          RandomNumberEngineFactory::getInstance().getCurrentTypeName(),
-          RandomNumberEngineFactory::getInstance().getPrototype().getseed(),
-          params);
-  // set new default
+  // note down old type
+  std::string oldtype = RandomNumberEngineFactory::getInstance().getCurrentTypeName();
+  DoLog(1) && (Log() << Verbose(1) << "Current engine is " << oldtype << std::endl);
+
+  // set the 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: "
+      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
+
+  // note down old parameters
+  RandomNumberEngine_Parameters *oldparameters =
+      RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+  // set each parameter (that is not -1);
+  {
+    std::stringstream input(params.parameters);
+    RandomNumberEngine_Parameters *currentparameters =
+        RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+    input >> *currentparameters;  // add new values on top
+    if (!currentparameters->isDefault()) {
+      DoLog(1) && (Log() << Verbose(1) << "Changing prototype's parameters." << std::endl);
+      RandomNumberEngineFactory::getInstance().manipulatePrototype(*currentparameters);
+    }
+    delete currentparameters;
   }
 
-  DoLog(0) && (Log() << Verbose(0) << "Default random number engine is now: "
-      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
+  {
+    RandomNumberEngine_Parameters *currentparameters =
+        RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+    DoLog(1) && (Log() << Verbose(1) << "Its parameters are: " << *currentparameters << std::endl);
+    delete  currentparameters;
+  }
 
-  return Action::state_ptr(state);
+  std::stringstream output;
+  output << *oldparameters;
+  CommandSetRandomNumbersEngineState *newstate =
+      new CommandSetRandomNumbersEngineState(oldtype,output.str(),params);
+  delete oldparameters;
+  return Action::state_ptr(newstate);
 }
 
@@ -71 +89 @@
       assert_cast<CommandSetRandomNumbersEngineState*>(_state.get());
 
-  // create a new state for redo
-  CommandSetRandomNumbersEngineState *newstate =
-      new CommandSetRandomNumbersEngineState(
-          RandomNumberEngineFactory::getInstance().getCurrentTypeName(),
-          RandomNumberEngineFactory::getInstance().getPrototype().getseed(),
-          state->params);
-  // set new default
+  // note down old type for redo
+  std::string newtype = RandomNumberEngineFactory::getInstance().getCurrentTypeName();
+  DoLog(1) && (Log() << Verbose(1) << "Newly set engine was " << newtype << std::endl);
+
+  // note down old parameters for redo
+  RandomNumberEngine_Parameters *newparameters =
+      RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+
+  // set the 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 again: "
+      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
+
+  // set each parameter back (that is not -1);
+  {
+    std::stringstream input(state->old_parameters);
+    RandomNumberEngine_Parameters *currentparameters =
+        RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+    input >> *currentparameters;
+    if (!currentparameters->isDefault()) {
+      DoLog(1) && (Log() << Verbose(1) << "Changing prototype's parameters." << std::endl);
+      RandomNumberEngineFactory::getInstance().manipulatePrototype(*currentparameters);
+    }
+    delete currentparameters;
   }
 
-  DoLog(0) && (Log() << Verbose(0) << "Default random number engine is undone to: "
-      << RandomNumberEngineFactory::getInstance().getCurrentTypeName() << std::endl);
+  {
+    RandomNumberEngine_Parameters *currentparameters =
+        RandomNumberEngineFactory::getInstance().getPrototype().getParameterSet();
+    DoLog(1) && (Log() << Verbose(1) << "Its parameters are: " << *currentparameters << std::endl);
+    delete  currentparameters;
+  }
 
+  std::stringstream output;
+  output << *newparameters;
+  CommandSetRandomNumbersEngineState *newstate =
+      new CommandSetRandomNumbersEngineState(newtype,output.str(),params);
+  delete newparameters;
   return Action::state_ptr(newstate);
 }

src/Actions/RandomNumbersAction/SetRandomNumbersEngineAction.def

@@ -7 +7 @@
 
 // all includes and forward declarations necessary for non-integral types below
-class MoleculeListClass;
 
 // i.e. there is an integer with variable name Z that can be found in
 // 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)(int)
-#define paramtokens ("set-random-number-engine")("random-number-seed")
+#define paramtypes (std::string)(std::string)
+#define paramtokens ("set-random-number-engine")("random-number-engine-parameters")
 #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 paramdefaults (NODEFAULT)("seed=-1")
+#define paramreferences (engine_type)(parameters)
 
-#define statetypes (std::string)(int)
-#define statereferences (old_engine_type)(old_seed)
+#define statetypes (std::string)(std::string)
+#define statereferences (old_engine_type)(old_parameters)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS