Changeset 719

Timestamp:

11/07/08 16:41:02 (15 years ago)

Author:

abeham

Message:

[TICKET #341] Changed HeuristicLab.Random operators to also take min/max, mu/sigma from scope

Location:

trunk/sources/HeuristicLab.Random

Files:

• NormalRandomAdder.cs (modified) (1 diff)
• NormalRandomizer.cs (modified) (1 diff)
• UniformRandomAdder.cs (modified) (1 diff)
• UniformRandomizer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Random/NormalRandomAdder.cs

@@ -67 +67 @@
       MersenneTwister mt = GetVariableValue<MersenneTwister>("Random", scope, true);
       double factor = GetVariableValue<DoubleData>("ShakingFactor", scope, true).Data;
-      double mu = GetVariableValue<DoubleData>("Mu", null, false).Data;
-      double sigma = GetVariableValue<DoubleData>("Sigma", null, false).Data;
+      double mu = GetVariableValue<DoubleData>("Mu", scope, true).Data;
+      double sigma = GetVariableValue<DoubleData>("Sigma", scope, true).Data;
       NormalDistributedRandom normal = new NormalDistributedRandom(mt, mu, sigma * factor);
 

trunk/sources/HeuristicLab.Random/NormalRandomizer.cs

@@ -60 +60 @@
       IObjectData value = GetVariableValue<IObjectData>("Value", scope, false);
       MersenneTwister mt = GetVariableValue<MersenneTwister>("Random", scope, true);
-      double mu = GetVariableValue<DoubleData>("Mu", null, false).Data;
-      double sigma = GetVariableValue<DoubleData>("Sigma", null, false).Data;
+      double mu = GetVariableValue<DoubleData>("Mu", scope, true).Data;
+      double sigma = GetVariableValue<DoubleData>("Sigma", scope, true).Data;
       NormalDistributedRandom normal = new NormalDistributedRandom(mt, mu, sigma);
 

trunk/sources/HeuristicLab.Random/UniformRandomAdder.cs

@@ -58 +58 @@
       MersenneTwister mt = GetVariableValue<MersenneTwister>("Random", scope, true);
       double factor = GetVariableValue<DoubleData>("ShakingFactor", scope, true).Data;
-      double min = GetVariableValue<DoubleData>("Min", null, false).Data;
-      double max = GetVariableValue<DoubleData>("Max", null, false).Data;
+      double min = GetVariableValue<DoubleData>("Min", scope, true).Data;
+      double max = GetVariableValue<DoubleData>("Max", scope, true).Data;
 
       double ex = (max - min) / 2.0 + min;

trunk/sources/HeuristicLab.Random/UniformRandomizer.cs

@@ -58 +58 @@
       IObjectData value = GetVariableValue<IObjectData>("Value", scope, false);
       MersenneTwister mt = GetVariableValue<MersenneTwister>("Random", scope, true);
-      double min = GetVariableValue<DoubleData>("Min", null, false).Data;
-      double max = GetVariableValue<DoubleData>("Max", null, false).Data;
+      double min = GetVariableValue<DoubleData>("Min", scope, true).Data;
+      double max = GetVariableValue<DoubleData>("Max", scope, true).Data;
 
       value.Accept(new RandomVisitor(mt, min, max));