Changeset 5023 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterConfigurationTree.cs

Timestamp:

12/04/10 18:08:43 (13 years ago)

Author:

cneumuel

Message:

#1215 worked on metaoptimization

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ParameterConfigurationTree.cs (modified) (6 diffs)

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

@@ -13 +13 @@
   [StorableClass]
   public class ParameterConfigurationTree : ValueConfiguration {
-    //[Storable]
-    //protected EngineAlgorithm algorithm;
-    //public EngineAlgorithm Algorithm {
-    //  get { return algorithm; }
-    //  set {
-    //    if (algorithm != value) {
-    //      if (algorithm != null) DeregisterAlgorithmEvents();
-    //      algorithm = value;
-    //      if (algorithm != null) RegisterAlgorithmEvents();
-    //      OnAlgorithmChanged();
-    //    }
-    //  }
-    //}
+    [Storable]
+    public EngineAlgorithm Algorithm {
+      get { return (EngineAlgorithm)base.ActualValue.Value; }
+      set {
+        base.ActualValue.Value = value;
+      }
+    }
 
     [Storable]
-    private DoubleValue quality;
-    public DoubleValue Quality {
-      get { return quality; }
+    private DoubleValue bestQuality;
+    public DoubleValue BestQuality {
+      get { return bestQuality; }
       set {
-        if (quality != value) {
-          if (quality != null) DeregisterQualityEvents();
-          quality = value;
-          if (quality != null) RegisterQualityEvents();
+        if (bestQuality != value) {
+          if (bestQuality != null) DeregisterQualityEvents();
+          bestQuality = value;
+          if (bestQuality != null) RegisterQualityEvents();
           OnQualityChanged();
         }
@@ -41 +35 @@
     }
 
+    [Storable]
+    private DoubleValue averageQuality;
+    public DoubleValue AverageQuality {
+      get { return averageQuality; }
+      set { averageQuality = value; }
+    }
+
+    [Storable]
+    private DoubleValue worstQuality;
+    public DoubleValue WorstQuality {
+      get { return worstQuality; }
+      set { worstQuality = value; }
+    }
+    
+    [Storable]
+    private DoubleValue qualityVariance;
+    public DoubleValue QualityVariance {
+      get { return qualityVariance; }
+      set { qualityVariance = value; }
+    }
+    
+    [Storable]
+    private DoubleValue qualityStandardDeviation;
+    public DoubleValue QualityStandardDeviation {
+      get { return qualityStandardDeviation; }
+      set { qualityStandardDeviation = value; }
+    }
+    
+    [Storable]
+    private TimeSpanValue averageExecutionTime;
+    public TimeSpanValue AverageExecutionTime {
+      get { return averageExecutionTime; }
+      set { averageExecutionTime = value; }
+    }
+
+    [Storable]
+    private IntValue repetitions;
+    public IntValue Repetitions {
+      get { return repetitions; }
+      set { repetitions = value; }
+    }
+
+    [Storable]
+    public RunCollection Runs { get; set; }
+    
     #region constructors and cloning
     public ParameterConfigurationTree(EngineAlgorithm algorithm) : base(algorithm, algorithm.GetType()) {
       this.Optimize = true; // root must always be optimized
-      this.Quality = new DoubleValue();
-      //this.algorithm = algorithm;
+      this.BestQuality = new DoubleValue();
     }
     public ParameterConfigurationTree() {
@@ -53 +91 @@
     protected ParameterConfigurationTree(bool deserializing) : base(deserializing) { }
     protected ParameterConfigurationTree(ParameterConfigurationTree original, Cloner cloner) : base(original, cloner) {
-      this.quality = cloner.Clone(original.Quality);
+      this.bestQuality = cloner.Clone(original.BestQuality);
+      this.Algorithm.Prepare();
+      this.Algorithm.Runs.Clear();
       Initialize();
     }
@@ -67 +107 @@
     private void Initialize() {
       //if (algorithm != null) RegisterAlgorithmEvents();
-      if (quality != null) RegisterQualityEvents();
+      if (bestQuality != null) RegisterQualityEvents();
+    }
+
+    public virtual void CollectResultValues(IDictionary<string, IItem> values) {
+      values.Add("RunsAverageExecutionTime", AverageExecutionTime);
+      values.Add("Repetitions", Repetitions);
+      values.Add("RunsBestQuality", BestQuality);
+      values.Add("RunsAverageQuality", AverageQuality);
+      values.Add("RunsWorstQuality", WorstQuality);
+      values.Add("RunsQualityVariance", QualityVariance);
+      values.Add("RunsQualityStandardDeviation", QualityStandardDeviation);
+      values.Add("Runs", Runs);
     }
 
@@ -89 +140 @@
     //}
     private void RegisterQualityEvents() {
-      Quality.ValueChanged += new EventHandler(Quality_ValueChanged);
+      BestQuality.ValueChanged += new EventHandler(Quality_ValueChanged);
     }
     private void DeregisterQualityEvents() {
-      Quality.ValueChanged -= new EventHandler(Quality_ValueChanged);
+      BestQuality.ValueChanged -= new EventHandler(Quality_ValueChanged);
     }
 
@@ -99 +150 @@
     }
     #endregion
+
   }
 }