Changeset 4832 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings

Timestamp:

11/18/10 11:07:45 (14 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

Location:

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

Files:

• Crossovers/ParameterConfigurationCrossover.cs (added)
• Crossovers/ParameterVectorCrossover.cs (deleted)
• IntValueParameterConfiguration.cs (modified) (1 diff)
• ParameterConfiguration.cs (modified) (5 diffs)
• RootParameterConfiguration.cs (modified) (1 diff)
• ValueTypeParameterConfiguration.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/IntValueParameterConfiguration.cs

@@ -12 +12 @@
   public class IntValueParameterConfiguration : ValueTypeParameterConfiguration<IntValue> {
 
-    public IntValueParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IItem value) : base(parentConfiguration, parameterName, value) {
+    public IntValueParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IValueParameter valueParameter) : base(parentConfiguration, parameterName, valueParameter) {
     }
 

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

@@ -46 +46 @@
     }
 
-    public virtual IParameter Parameter {
-      get {
-        return parentConfiguration.GetChildParameter(this.parameterName);
-      }
+    //public virtual IParameter Parameter {
+    //  get {
+    //    return parentConfiguration.GetChildParameter(this.parameterName);
+    //  }
+    //}
+
+
+    protected Type parameterType;
+    public Type ParameterType {
+      get { return this.parameterType; }
+    }
+
+    protected Type valueType;
+    public Type ValueType {
+      get { return this.valueType; }
     }
 
@@ -66 +77 @@
     }
 
-    public ParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IItem value) {
+    // store parameter reference only for name/description/image/...
+    private IValueParameter parameter;
+
+    public ParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IValueParameter valueParameter) {
       this.parentConfiguration = parentConfiguration;
       this.ParameterName = parameterName;
-      this.Value = value;
+      this.Value = valueParameter.Value;
+      this.parameterType = valueParameter.GetType();
+      this.valueType = valueParameter.DataType;
+
+      this.parameter = valueParameter;
     }
 
@@ -102 +120 @@
     #region INamedItem Properties
     public virtual string Name {
-      get { return Parameter.Name; }
+      get { return ParameterName; }
       set { throw new NotSupportedException(); }
     }
     public virtual string Description {
-      get { return Parameter.Description; }
+      get { return parameter.Description; }
       set { throw new NotSupportedException(); }
     }
@@ -116 +134 @@
     }
     public virtual string ItemDescription {
-      get { return Parameter.ItemDescription; }
+      get { return parameter.Description; }
     }
     public virtual System.Drawing.Image ItemImage {
-      get { return Parameter.ItemImage; }
+      get { return parameter.ItemImage; }
     }
     public virtual string ItemName {
-      get { return Parameter.ItemName; }
+      get { return parameter.ItemName; }
     }
     public virtual Version ItemVersion {
-      get { return Parameter.ItemVersion; }
+      get { return parameter.ItemVersion; }
     }
     #endregion
@@ -192 +210 @@
 
         if (typeof(IntValue).IsAssignableFrom(parameter.DataType)) {
-          return new IntValueParameterConfiguration(parentConfiguration, parameter.Name, valueParameter.Value);
+          return new IntValueParameterConfiguration(parentConfiguration, parameter.Name, valueParameter);
         } else if (typeof(IParameterizedItem).IsAssignableFrom(parameter.DataType)) {
-          return new ParameterConfiguration(parentConfiguration, parameter.Name, valueParameter.Value);
+          return new ParameterConfiguration(parentConfiguration, parameter.Name, valueParameter);
         } else {
           // todo
-          return new IntValueParameterConfiguration(parentConfiguration, parameter.Name, valueParameter.Value);
+          return new IntValueParameterConfiguration(parentConfiguration, parameter.Name, valueParameter);
         }
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/RootParameterConfiguration.cs

@@ -34 +34 @@
     }
 
-    public override IParameter Parameter {
-      get { return null; }
-    }
+    //public override IParameter Parameter {
+    //  get { return null; }
+    //}
 
     #region INamedItem Properties

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ValueTypeParameterConfiguration.cs

@@ -18 +18 @@
     }
 
-    public ValueTypeParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IItem value) : base(parentConfiguration, parameterName, value) {
+    public ValueTypeParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IValueParameter valueParameter) : base(parentConfiguration, parameterName, valueParameter) {
       this.ranges = new ItemList<IRange<T>>();
       this.ranges.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IRange<T>>>(ranges_ItemsAdded);