Changeset 5009 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/RangeConstraints/DoubleValueRange.cs

Timestamp:

12/01/10 20:37:36 (13 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/RangeConstraints/DoubleValueRange.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/RangeConstraints/DoubleValueRange.cs

@@ -5 +5 @@
 using HeuristicLab.Data;
 using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization {
+  [StorableClass]
   public class DoubleValueRange : Range<DoubleValue> {
 
     public DoubleValueRange(DoubleValue lowerBound, DoubleValue upperBound, DoubleValue stepSize) : base(lowerBound, upperBound, stepSize) { }
     public DoubleValueRange() { }
+    [StorableConstructor]
+    protected DoubleValueRange(bool deserializing) : base(deserializing) { }
     protected DoubleValueRange(DoubleValueRange original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -16 +21 @@
     }
 
-    public override DoubleValue GetRandomValue() {
-      Random rand = new Random(); // todo: use common random
+    public override DoubleValue GetRandomValue(IRandom random) {
       double val;
       do {
-        val = Math.Round((rand.NextDouble() * (UpperBound.Value - LowerBound.Value) + LowerBound.Value) / StepSize.Value, 0) * StepSize.Value;
+        val = Math.Round((random.NextDouble() * (UpperBound.Value - LowerBound.Value) + LowerBound.Value) / StepSize.Value, 0) * StepSize.Value;
       } while (val < LowerBound.Value || val > UpperBound.Value);
       return new DoubleValue(val);