Changeset a483e4 for src/Actions/RandomNumbersAction

Timestamp:

Jun 13, 2012, 5:39:04 PM (13 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:

7d9416

Parents:

97f9b9

git-author:

Frederik Heber <heber@…> (05/10/12 09:57:34)

git-committer:

Frederik Heber <heber@…> (06/13/12 17:39:04)

Message:

SetRandomNumbersDistributionAction does not request complex RandomNumbersDistribution_Parameters but simple std::string.

• strangely, SetRandomNumbersEngineAction does this already ... :)
• this means that RandomNumberDistribution_Parameters...Query are obsolete. They should be refactored into a simple KeyValueQuery and the above parameters of Actions that require a parameter string converted to this type.

Location:

src/Actions/RandomNumbersAction

Files:

• SetRandomNumbersDistributionAction.cpp (modified) (4 diffs)
• SetRandomNumbersDistributionAction.def (modified) (2 diffs)

src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp

@@ -55 +55 @@
       RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
   // set each parameter (that is not -1);
-  if (!params.parameters.get().isDefault()) {
+  {
+    std::stringstream input(params.parameters.get());
     RandomNumberDistribution_Parameters *currentparameters =
         RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
-    currentparameters->update(params.parameters.get());
-    LOG(1, "INFO: Changing prototype's parameters to " << params.parameters.get() << ".");
-    RandomNumberDistributionFactory::getInstance().manipulatePrototype(*currentparameters);
+    input >> *currentparameters;  // add new values on top
+    if (!currentparameters->isDefault()) {
+      LOG(1, "Changing prototype's parameters.");
+      RandomNumberDistributionFactory::getInstance().manipulatePrototype(*currentparameters);
+    }
     delete currentparameters;
   }
@@ -71 +74 @@
   }
 
+  std::stringstream output;
+  output << *oldparameters;
   CommandSetRandomNumbersDistributionState *newstate =
-      new CommandSetRandomNumbersDistributionState(oldtype,*oldparameters,params);
+      new CommandSetRandomNumbersDistributionState(oldtype,output.str(),params);
   delete oldparameters;
   return Action::state_ptr(newstate);
@@ -94 +99 @@
 
   // set each parameter back (that is not -1);
-  if (!state->old_parameters.isDefault()) {
-    LOG(1, "INFO: Changing back prototype's parameters to " << state->old_parameters << ".");
-    RandomNumberDistributionFactory::getInstance().manipulatePrototype(state->old_parameters);
+  {
+    std::stringstream input(state->old_parameters);
+    RandomNumberDistribution_Parameters *currentparameters =
+        RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
+    input >> *currentparameters;
+    if (!currentparameters->isDefault()) {
+      LOG(1, "Changing prototype's parameters.");
+      RandomNumberDistributionFactory::getInstance().manipulatePrototype(*currentparameters);
+    }
+    delete currentparameters;
   }
 
@@ -106 +118 @@
   }
 
+  std::stringstream output;
+  output << *newparameters;
   CommandSetRandomNumbersDistributionState *newstate =
-      new CommandSetRandomNumbersDistributionState(newtype,*newparameters,params);
+      new CommandSetRandomNumbersDistributionState(newtype,output.str(),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
-#include "RandomNumbers/RandomNumberDistribution_Parameters.hpp"
+#include <string>
 
 // 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)(class RandomNumberDistribution_Parameters)
+#define paramtypes (std::string)(std::string)
 #define paramtokens ("set-random-number-distribution")("random-number-distribution-parameters")
 #define paramdescriptions ("name of the distribution from boost::random")("parameter set for requested distribution")
@@ -18 +18 @@
 #define paramreferences (distribution_type)(parameters)
 
-#define statetypes (std::string)(RandomNumberDistribution_Parameters)
+#define statetypes (std::string)(std::string)
 #define statereferences (old_distribution_type)(old_parameters)