Changeset 5313 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations

Timestamp:

01/17/11 19:17:51 (14 years ago)

Author:

cneumuel

Message:

#1215

• changed AlgorithType and ProblemType to actually be types not objects. this eliminates redundant views for MetaOptimizationProblem
• import algorithm for MetaOptimizationProblem
• nicer dialog for combination creation
• fixed iconimage for ParameterConfigurations
• fixed ValidValues

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (6 diffs)

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

@@ -13 +13 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Collections;
+using System.Drawing;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -43 +44 @@
 
     [Storable]
+    private Image itemImage;
+    public virtual Image ItemImage {
+      get { return itemImage ?? base.ItemImage; }
+    }
+
+    [Storable]
     protected string parameterName;
     public string ParameterName {
@@ -133 +140 @@
       this.validTypes = GetValidTypes(valueParameter).ToArray();
       this.IsNullable = valueParameter.ItemName.StartsWith("Optional");
+      this.itemImage = valueParameter.ItemImage;
       if (IsNullable) {
         validTypes = new List<Type>(validTypes) { typeof(NullValue) }.ToArray();
       }
-      this.ValueConfigurations = new CheckedValueConfigurationList();
+      this.ValueConfigurations = new CheckedValueConfigurationList(this.validValues ?? CreateValidValues());
       this.ActualValue = new ConstrainedValue(
         valueParameter.Value != null ? (IItem)valueParameter.Value.Clone() : null, 
@@ -162 +170 @@
       this.actualValueConfigurationIndex = original.actualValueConfigurationIndex;
       this.isNullable = original.isNullable;
+      this.itemImage = original.itemImage;
       if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
     }
@@ -246 +255 @@
     }
 
-    private ItemSet<IItem> CreateValidValues() {
+    private IItemSet<IItem> CreateValidValues() {
       var validValues = new ItemSet<IItem>();
       foreach (Type t in this.validTypes) {
@@ -295 +304 @@
     }
     public override string ItemDescription {
-      //get { return parameter != null ? parameter.Description : base.ItemDescription; }
       get { return base.ItemDescription; }
     }
-    public override System.Drawing.Image ItemImage {
-      //get { return parameter != null ? parameter.ItemImage : base.ItemImage; }
-      get { return base.ItemImage; }
-    }
     public override string ItemName {
-      //get { return parameter != null ?parameter.ItemName : base.ItemName; }
       get { return base.ItemName; }
     }