Changeset 4984 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ValueConfigurations/ValueConfiguration.cs

Timestamp:

11/28/10 23:58:59 (14 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ValueConfigurations/ValueConfiguration.cs (modified) (5 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ValueConfigurations/ValueConfiguration.cs

@@ -10 +10 @@
   // TODO: ItemName/Descr, storability
   public class ValueConfiguration : Item, IValueConfiguration {
+    protected bool isOptimizable;
+    public bool IsOptimizable {
+      get { return isOptimizable; }
+      set {
+        if (this.isOptimizable != value) {
+          this.isOptimizable = value;
+          OnIsOptimizableChanged();
+        }
+      }
+    }
+
     protected bool optimize;
     public bool Optimize {
@@ -52 +63 @@
       get { return rangeConstraint; }
     }
-    
+
     #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
       this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
       this.ConstrainedValue = new ConstrainedValue(value, valueDataType);
+      this.IsOptimizable = true;
       if (constrainedValue.ValueDataType == typeof(IntValue)) {
         rangeConstraint = new Range<IntValue>(new IntValue(0), (IntValue)value, new IntValue(1));
       } else if (constrainedValue.ValueDataType == typeof(DoubleValue)) {
-        rangeConstraint = new Range<DoubleValue>(new DoubleValue(0), (DoubleValue)value, new DoubleValue(0.1));
+        rangeConstraint = new Range<DoubleValue>(new DoubleValue(0), (DoubleValue)value, new DoubleValue(0.01));
+      } else if (constrainedValue.ValueDataType == typeof(PercentValue)) {
+        rangeConstraint = new Range<PercentValue>(new PercentValue(0), new PercentValue(1), new PercentValue(0.001));
+      } else if (constrainedValue.ValueDataType == typeof(BoolValue)) {
+        this.IsOptimizable = false; // there is nothing to configure for bools
       } else {
         rangeConstraint = null;
@@ -74 +90 @@
       this.ConstrainedValue = cloner.Clone(original.ConstrainedValue);
       this.rangeConstraint = cloner.Clone(original.RangeConstraint);
+      this.IsOptimizable = original.IsOptimizable;
       RegisterEvents();
     }
@@ -131 +148 @@
     }
 
+    public virtual event EventHandler IsOptimizableChanged;
+    private void OnIsOptimizableChanged() {
+      var handler = IsOptimizableChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
     public virtual event EventHandler OptimizeChanged;
     protected virtual void OnOptimizeChanged() {
@@ -140 +163 @@
     public override string ToString() {
       if (ConstrainedValue != null && ConstrainedValue.Value != null) {
-        if(Optimize) {
-          return string.Format("{0}: {1}", ConstrainedValue.Value.ItemName, RangeConstraint);
+        if (ConstrainedValue.Value is IParameterizedItem) {
+          if (Optimize) {
+            return string.Format("{0} (Optimize)", ConstrainedValue.Value.ItemName);
+          } else {
+            return string.Format("{0}", ConstrainedValue.Value.ItemName);
+          }
         } else {
-          return string.Format("{0}: {1}", ConstrainedValue.Value.ItemName, ConstrainedValue.Value);
-        }        
+          if (Optimize) {
+            return string.Format("{0} (Optimize: {1})", ConstrainedValue.Value.ItemName, RangeConstraint);
+          } else {
+            return string.Format("{0}: {1}", ConstrainedValue.Value.ItemName, ConstrainedValue.Value);
+          }
+        }
       } else {
         return base.ToString();
       }
-
     }
   }