Changeset 6090 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Timestamp:

05/01/11 22:02:28 (14 years ago)

Author:

cneumuel

Message:

#1215

• added weight parameters for quality, stddev and evaluated solutions
• lots of fixes

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Files:

• RangeConstraints/DoubleValueRange.cs (modified) (2 diffs)
• RangeConstraints/Range.cs (modified) (4 diffs)
• ValueConfigurations/RangeValueConfiguration.cs (modified) (1 diff)

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -12 +10 @@
   public class DoubleValueRange : Range<DoubleValue> {
 
+    public override DoubleValue LowerBound {
+      get {
+        return base.LowerBound;
+      }
+      set {
+        base.LowerBound = value;
+      }
+    }
+    
     public DoubleValueRange(DoubleValue lowerBound, DoubleValue upperBound, DoubleValue stepSize) : base(lowerBound, upperBound, stepSize) { }
     public DoubleValueRange() { }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/Range.cs

@@ -12 +12 @@
     [Storable]
     private T lowerBound;
-    public T LowerBound {
+    public virtual T LowerBound {
       get { return lowerBound; }
       set {
@@ -30 +30 @@
     [Storable]
     private T upperBound;
-    public T UpperBound {
+    public virtual T UpperBound {
       get { return upperBound; }
       set {
@@ -48 +48 @@
     [Storable]
     private T stepSize;
-    public T StepSize {
+    public virtual T StepSize {
       get { return stepSize; }
       set {
@@ -197 +197 @@
       if (random.NextDouble() < 0.1) {
         if (random.NextDouble() < 0.5) {
-          return LowerBound;
+          return (T)LowerBound.Clone();
         } else {
-          return UpperBound;
+          return (T)UpperBound.Clone();
         }
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/RangeValueConfiguration.cs

@@ -36 +36 @@
       : base(value, valueDataType) {
       if (actualValue.ValueDataType == typeof(IntValue)) {
-        RangeConstraint = new IntValueRange(new IntValue(0), (IntValue)value, new IntValue(1));
+        RangeConstraint = new IntValueRange(new IntValue(0), (IntValue)value.Clone(), new IntValue(1));
       } else if (actualValue.ValueDataType == typeof(DoubleValue)) {
-        RangeConstraint = new DoubleValueRange(new DoubleValue(0), (DoubleValue)value, new DoubleValue(0.01));
+        RangeConstraint = new DoubleValueRange(new DoubleValue(0), (DoubleValue)value.Clone(), new DoubleValue(0.01));
       } else if (actualValue.ValueDataType == typeof(PercentValue)) {
         RangeConstraint = new PercentValueRange(new PercentValue(0), new PercentValue(1), new PercentValue(0.01));