Changeset 4981 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization

Timestamp:

11/28/10 21:42:49 (14 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

Location:

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

Files:

• Encodings/ParameterConfigurations/ParameterConfiguration.cs (modified) (10 diffs)
• Encodings/RangeConstraints (added)
• Encodings/RangeConstraints/ConstrainedValue.cs (added)
• Encodings/RangeConstraints/Range.cs (added)
• Encodings/ValueConfigurations/CheckedValueConfigurationCollection.cs (added)
• Encodings/ValueConfigurations/ValueConfiguration.cs (modified) (3 diffs)
• Encodings/ValueTypeParameterConfiguration.cs (deleted)
• HeuristicLab.Problems.MetaOptimization-3.3.csproj (modified) (2 diffs)
• Interfaces/ICheckedValueConfigurationCollection.cs (added)
• Interfaces/IOptimizable.cs (added)
• Interfaces/IParameterConfiguration.cs (modified) (1 diff)
• Interfaces/IRange.cs (modified) (2 diffs)
• Interfaces/IValueConfiguration.cs (modified) (1 diff)
• Range.cs (deleted)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterConfigurations/ParameterConfiguration.cs

@@ -14 +14 @@
 
     [Storable]
-    protected bool optimizationEnabled;
-    public bool OptimizationEnabled {
-      get { return optimizationEnabled; }
+    protected bool optimize;
+    public bool Optimize {
+      get { return optimize; }
       set {
-        if (optimizationEnabled != value) {
-          optimizationEnabled = value;
-          if (optimizationEnabled) {
+        if (optimize != value) {
+          optimize = value;
+          if (optimize) {
             PopulateValueConfigurations();
           } else {
             this.ValueConfigurations.Clear();
           }
-          OnOptimizationEnabledChanged();
+          OnOptimizeChanged();
         }
       }
@@ -62 +62 @@
     }
 
-    protected ICheckedItemList<IValueConfiguration> valueConfigurations;
-    public ICheckedItemList<IValueConfiguration> ValueConfigurations {
+    protected ICheckedValueConfigurationCollection valueConfigurations;
+    public ICheckedValueConfigurationCollection ValueConfigurations {
       get { return this.valueConfigurations; }
       protected set { this.valueConfigurations = value; }
@@ -75 +75 @@
     }
 
+    public ConstrainedValue ConstrainedValue {
+      get { return actualValueConfiguration.ConstrainedValue; }
+      set { actualValueConfiguration.ConstrainedValue = value; }
+    }
+    
     // store parameter reference only for name/description/image/...
     private IValueParameter parameter;
 
+    #region Constructors and Cloning
     public ParameterConfiguration(string parameterName, IValueParameter valueParameter) {
       this.ParameterName = parameterName;
@@ -84 +90 @@
       this.valueDataType = valueParameter.DataType;
       this.validValues = GetValidValues();
-      this.ValueConfigurations = new CheckedItemList<IValueConfiguration>();
+      this.ValueConfigurations = new CheckedValueConfigurationCollection(this.valueDataType);
       this.ActualValueConfiguration = new ValueConfiguration(valueParameter.Value, valueParameter.DataType);
-      if (OptimizationEnabled) {
+      if (Optimize) {
         PopulateValueConfigurations();
       }
@@ -94 +100 @@
     [StorableConstructor]
     protected ParameterConfiguration(bool deserializing) { }
-    protected ParameterConfiguration(ParameterConfiguration original, Cloner cloner) : base(original, cloner) {
+    protected ParameterConfiguration(ParameterConfiguration original, Cloner cloner)
+      : base(original, cloner) {
       this.ParameterName = original.ParameterName;
       this.parameterDataType = original.parameterDataType;
@@ -102 +109 @@
       this.ValueConfigurations = cloner.Clone(original.ValueConfigurations);
       this.ActualValueConfiguration = cloner.Clone(original.ActualValueConfiguration);
-      this.OptimizationEnabled = original.optimizationEnabled;
+      this.Optimize = original.optimize;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ParameterConfiguration(this, cloner);
     }
+    #endregion
 
     private void PopulateValueConfigurations() {
@@ -118 +126 @@
     }
 
-    void ValidValues_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<IItem>> e) {
-      var oldItems = e.OldItems.Select(x => x.Value);
-      var newItems = e.Items.Select(x => x.Value);
-      var intersection = oldItems.Intersect(newItems);
-      var removedItems = oldItems.Where(x => !intersection.Contains(x));
-      var addedItems = newItems.Where(x => !intersection.Contains(x));
-
-      foreach (var item in removedItems) {
-        RemoveValueConfiguration(item);
-      }
-      foreach (var item in addedItems) {
-        this.ValueConfigurations.Add(new ValueConfiguration(item, item.GetType()));
-      }
-    }
-
-    private void RemoveValueConfiguration(IItem item) {
-      IValueConfiguration vc = this.ValueConfigurations.Single(x => x.ValueDataType == item.GetType());
-      this.ValueConfigurations.Remove(vc);
-    }
+    //void ValidValues_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<Collections.IndexedItem<IItem>> e) {
+    //  var oldItems = e.OldItems.Select(x => x.Value);
+    //  var newItems = e.Items.Select(x => x.Value);
+    //  var intersection = oldItems.Intersect(newItems);
+    //  var removedItems = oldItems.Where(x => !intersection.Contains(x));
+    //  var addedItems = newItems.Where(x => !intersection.Contains(x));
+
+    //  foreach (var item in removedItems) {
+    //    RemoveValueConfiguration(item);
+    //  }
+    //  foreach (var item in addedItems) {
+    //    this.ValueConfigurations.Add(new ValueConfiguration(item, item.GetType()));
+    //  }
+    //}
+
+    //private void RemoveValueConfiguration(IItem item) {
+    //  IValueConfiguration vc = this.ValueConfigurations.Single(x => x.ValueDataType == item.GetType());
+    //  this.ValueConfigurations.Remove(vc);
+    //}
 
     #region INamedItem Properties
@@ -198 +206 @@
     }
 
-    public virtual event EventHandler OptimizationEnabledChanged;
-    protected virtual void OnOptimizationEnabledChanged() {
-      var handler = OptimizationEnabledChanged;
+    public virtual event EventHandler OptimizeChanged;
+    protected virtual void OnOptimizeChanged() {
+      var handler = OptimizeChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -206 +214 @@
 
     public override string ToString() {
-      return string.Format("{0}", ParameterName);
+      return string.Format("{0}: {1}", ParameterName, ConstrainedValue.Value);
     }
 
@@ -217 +225 @@
       return null;
     }
-
   }
 }

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

@@ -1 +1 @@
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
+using System.Drawing;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  [StorableClass]
-  public class ValueConfiguration : DeepCloneable, IValueConfiguration {
-    [Storable]
-    protected IItemList<IParameterConfiguration> parameterConfigurations = new ItemList<IParameterConfiguration>();
-    public IItemList<IParameterConfiguration> ParameterConfigurations {
+  // TODO: ItemName/Descr, storability
+  public class ValueConfiguration : Item, IValueConfiguration {
+    protected bool optimize;
+    public bool Optimize {
+      get { return optimize; }
+      set {
+        if (optimize != value) {
+          optimize = value;
+          if (optimize) {
+            ClearParameterConfigurations();
+            PopulateParameterConfigurations();
+          } else {
+            ClearParameterConfigurations();
+          }
+          OnOptimizeChanged();
+          OnToStringChanged();
+        }
+      }
+    }
+
+    protected IItemCollection<IParameterConfiguration> parameterConfigurations = new ItemCollection<IParameterConfiguration>();
+    public IItemCollection<IParameterConfiguration> ParameterConfigurations {
       get { return this.parameterConfigurations; }
       protected set { this.parameterConfigurations = value; }
     }
 
-    protected IItem value;
-    public IItem Value {
-      get { return value; }
+    protected ConstrainedValue constrainedValue;
+    public ConstrainedValue ConstrainedValue {
+      get { return constrainedValue; }
       set {
-        if (this.value != value) {
-          ClearChildParameterConfigurations();
-          this.value = value;
-          if (this.value is IParameterizedNamedItem) AddChildParameterConfigurations(this.value as IParameterizedNamedItem);
+        if (this.constrainedValue != value) {
+          ClearParameterConfigurations();
+          this.constrainedValue = value;
+          PopulateParameterConfigurations();
           OnValueChanged();
+          OnToStringChanged();
         }
       }
     }
 
-    protected Type valueDataType;
-    public Type ValueDataType {
-      get { return this.valueDataType; }
-      protected set { this.valueDataType = value; }
+    protected IRange rangeConstraint;
+    public IRange RangeConstraint {
+      get { return rangeConstraint; }
     }
-
+    
+    #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
-      this.Value = value;
-      this.ValueDataType = valueDataType;
+      this.parameterConfigurations = new ItemList<IParameterConfiguration>();
+      this.ConstrainedValue = new ConstrainedValue(value, valueDataType);
+      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));
+      } else {
+        rangeConstraint = null;
+      }
+      RegisterEvents();
     }
 
@@ -43 +72 @@
     protected ValueConfiguration(ValueConfiguration original, Cloner cloner) : base(original, cloner) {
       this.ParameterConfigurations = cloner.Clone(original.ParameterConfigurations);
-      this.Value = cloner.Clone(original.Value);
-      this.ValueDataType = original.ValueDataType;
-
+      this.ConstrainedValue = cloner.Clone(original.ConstrainedValue);
+      this.rangeConstraint = cloner.Clone(original.RangeConstraint);
+      RegisterEvents();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ValueConfiguration(this, cloner);
     }
+    #endregion
 
-    protected virtual void AddChildParameterConfigurations(IParameterizedNamedItem parameterizedItem) {
-      foreach (var childParameter in parameterizedItem.Parameters) {
-        var pc = ParameterConfiguration.Create(parameterizedItem, childParameter);
-        if (pc != null) this.ParameterConfigurations.Add(pc);
+    protected virtual void PopulateParameterConfigurations() {
+      if (this.constrainedValue.Value is IParameterizedNamedItem) {
+        var parameterizedItem = this.constrainedValue.Value as IParameterizedNamedItem;
+        foreach (var childParameter in parameterizedItem.Parameters) {
+          var pc = ParameterConfiguration.Create(parameterizedItem, childParameter);
+          if (pc != null) this.ParameterConfigurations.Add(pc);
+        }
       }
     }
-    protected virtual void ClearChildParameterConfigurations() {
+    protected virtual void ClearParameterConfigurations() {
       ParameterConfigurations.Clear();
     }
-    
-    #region IItem Members
-    public string ItemDescription {
-      get { return value.ItemDescription; }
+
+    private void RegisterEvents() {
+      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.ConstrainedValue != null) this.ConstrainedValue.ToStringChanged += new EventHandler(ConstrainedValue_ToStringChanged);
+    }
+    private void DeregisterEvents() {
+      if (this.RangeConstraint != null) this.RangeConstraint.ToStringChanged += new EventHandler(RangeConstraint_ToStringChanged);
+      if (this.ConstrainedValue != null) this.ConstrainedValue.ToStringChanged += new EventHandler(ConstrainedValue_ToStringChanged);
     }
 
-    public System.Drawing.Image ItemImage {
-      get { return value.ItemImage; }
+    void ConstrainedValue_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
+    }
+    void RangeConstraint_ToStringChanged(object sender, EventArgs e) {
+      OnToStringChanged();
     }
 
-    public string ItemName {
-      get { return value.ItemDescription; }
+    #region IItem Members
+    public override string ItemDescription {
+      get { return (constrainedValue != null && constrainedValue.Value != null) ? constrainedValue.Value.ItemDescription : base.ItemDescription; }
     }
 
-    public Version ItemVersion {
-      get { return value.ItemVersion; }
+    public override Image ItemImage {
+      get { return (constrainedValue != null && constrainedValue.Value != null) ? constrainedValue.Value.ItemImage : base.ItemImage; }
+    }
+
+    public override string ItemName {
+      get { return (constrainedValue != null && constrainedValue.Value != null) ? constrainedValue.Value.ItemDescription : base.ItemName; }
     }
     #endregion
 
-    #region Events
-    public virtual event EventHandler ItemImageChanged;
-    protected virtual void OnItemImageChanged(object sender, EventArgs e) {
-      var handler = ItemImageChanged;
-      if (handler != null) handler(sender, e);
-    }
-
-    public virtual event EventHandler ToStringChanged;
-    protected virtual void OnStringChanged(object sender, EventArgs e) {
-      var handler = ToStringChanged;
-      if (handler != null) handler(this, e); // important to set 'this' as sender
-    }
-
+    #region Event Handlers
     public virtual event EventHandler ValueChanged;
     protected virtual void OnValueChanged() {
@@ -97 +130 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
+
+    public virtual event EventHandler OptimizeChanged;
+    protected virtual void OnOptimizeChanged() {
+      var handler = OptimizeChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
     #endregion
 
     public override string ToString() {
-      return value.ItemName;
+      if (ConstrainedValue != null && ConstrainedValue.Value != null) {
+        if(Optimize) {
+          return string.Format("{0}: {1}", ConstrainedValue.Value.ItemName, RangeConstraint);
+        } else {
+          return string.Format("{0}: {1}", ConstrainedValue.Value.ItemName, ConstrainedValue.Value);
+        }        
+      } else {
+        return base.ToString();
+      }
+
     }
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj

@@ -88 +88 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestParameterConfigurationAnalyzer.cs" />
+    <Compile Include="Encodings\RangeConstraints\ConstrainedValue.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Encodings\ValueConfigurations\ValueConfiguration.cs" />
+    <Compile Include="Encodings\ValueConfigurations\CheckedValueConfigurationCollection.cs" />
+    <Compile Include="Interfaces\ICheckedValueConfigurationCollection.cs" />
+    <Compile Include="Interfaces\IOptimizable.cs" />
     <Compile Include="Interfaces\IParameterConfigurationCreator.cs" />
     <Compile Include="Creators\RandomParameterConfigurationCreator.cs" />
@@ -99 +105 @@
     <Compile Include="Encodings\ParameterConfigurations\ParameterConfiguration.cs" />
     <Compile Include="Interfaces\IValueConfiguration.cs" />
-    <Compile Include="Range.cs" />
+    <Compile Include="Encodings\RangeConstraints\Range.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MetaOptimizationProblem.cs" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfiguration.cs

@@ -2 +2 @@
 using HeuristicLab.Core;
 using System.Collections.Generic;
+using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IParameterConfiguration : INamedItem {
-    bool OptimizationEnabled { get; set; }
+  public interface IParameterConfiguration : IOptimizable, INamedItem {
     string ParameterName { get; set; }
     Type ParameterDataType { get; }
-    ICheckedItemList<IValueConfiguration> ValueConfigurations { get; }
+    ICheckedValueConfigurationCollection ValueConfigurations { get; }
     IValueConfiguration ActualValueConfiguration { get; set; }
-    Type ValueDataType { get; }
     IEnumerable<IItem> ValidValues { get; }
-
-    event EventHandler OptimizationEnabledChanged;
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IRange.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IRange<T> : IItem where T : class, IItem, IStringConvertibleValue, IDeepCloneable {
-    T LowerBound { get; set; }
-    T UpperBound { get; set; }
-    T StepSize { get; set; }
+  public interface IRange : IItem, IStringConvertibleValue {
+    object LowerBound { get; set; }
+    object UpperBound { get; set; }
+    object StepSize { get; set; }
 
     event EventHandler LowerBoundChanged;
@@ -14 +14 @@
     event EventHandler StepSizeChanged;
   }
+
+  public interface IRange<T> : IRange, IItem where T : class {
+    new T LowerBound { get; set; }
+    new T UpperBound { get; set; }
+    new T StepSize { get; set; }
+  }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IValueConfiguration.cs

@@ -1 +1 @@
 using System;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MetaOptimization {
-  public interface IValueConfiguration : IItem {
-    IItem Value { get; set; }
-    Type ValueDataType { get; }
-    IItemList<IParameterConfiguration> ParameterConfigurations { get; }
-
+  public interface IValueConfiguration : IOptimizable, IItem {
+    IItemCollection<IParameterConfiguration> ParameterConfigurations { get; }
+    IRange RangeConstraint { get; }
     event EventHandler ValueChanged;
   }