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

Timestamp:

01/17/11 19:17:51 (13 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

Location:

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

Files:

• ParameterConfigurationTree.cs (modified) (5 diffs)
• ParameterConfigurations/ParameterConfiguration.cs (modified) (6 diffs)
• ValueConfigurations/CheckedValueConfigurationCollection.cs (modified) (1 diff)

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

@@ -105 +105 @@
     }
 
+    [Storable]
+    protected string name;
+    public string Name {
+      get { return name; }
+      set { name = value; }
+    }
+
     #region constructors and cloning
     public ParameterConfigurationTree(EngineAlgorithm algorithm)
@@ -110 +117 @@
       this.Optimize = true; // root must always be optimized
       this.parameters = new Dictionary<string, IItem>();
-
+      this.Name = algorithm.ItemName;
       PopulateParameterConfigurations(algorithm);
     }
@@ -119 +126 @@
     protected ParameterConfigurationTree(ParameterConfigurationTree original, Cloner cloner)
       : base(original, cloner) {
+      this.name = original.name;
       this.bestQualities = cloner.Clone(original.BestQualities);
       this.averageQualities = cloner.Clone(original.averageQualities);
@@ -186 +194 @@
         if (createBatchRuns) {
           BatchRun batchRun = new BatchRun(string.Format("BatchRun: {0}", combination.ParameterInfoString));
-          batchRun.Algorithm = clonedAlg;
+          batchRun.Optimizer = clonedAlg;
           batchRun.Repetitions = repetitions;
           experiment.Optimizers.Add(batchRun);
@@ -218 +226 @@
       return allOptimizables[random.Next(allOptimizables.Count)];
     }
+
+    public override string ToString() {
+      return this.Name;
+    }
   }
 }

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; }
     }

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

@@ -25 +25 @@
     }
 
-    public CheckedValueConfigurationList(ItemSet<IItem> validValues) {
+    public CheckedValueConfigurationList(IItemSet<IItem> validValues) {
       this.validValues = validValues;
       RegisterEvents();