Changes in src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp [be21fa:a483e4]

File:

• src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp (modified) (5 diffs)

src/Actions/RandomNumbersAction/SetRandomNumbersDistributionAction.cpp

@@ -47 +47 @@
 
   // set the new default
-  RandomNumberDistributionFactory::getInstance().setCurrentType(params.distribution_type);
+  RandomNumberDistributionFactory::getInstance().setCurrentType(params.distribution_type.get());
   LOG(0, "STATUS: Distribution of random number generator is now: "
       << RandomNumberDistributionFactory::getInstance().getCurrentTypeName());
@@ -55 +55 @@
       RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
   // set each parameter (that is not -1);
-  if (!params.parameters.isDefault()) {
+  {
+    std::stringstream input(params.parameters.get());
     RandomNumberDistribution_Parameters *currentparameters =
         RandomNumberDistributionFactory::getInstance().getPrototype().getParameterSet();
-    currentparameters->update(params.parameters);
-    LOG(1, "INFO: Changing prototype's parameters to " << params.parameters << ".");
-    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);