Changeset 5212 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

Timestamp:

01/05/11 02:03:20 (13 years ago)

Author:

cneumuel

Message:

#1215

• added normalization for quality values of individuals

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs (modified) (7 diffs)

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

@@ -14 +14 @@
   [StorableClass]
   public class ParameterConfigurationTree : ValueConfiguration, IEnumerable {
-    [Storable]
-    private DoubleValue bestQuality;
-    public DoubleValue BestQuality {
-      get { return bestQuality; }
+
+    [Storable]
+    private DoubleValue averageQualityNormalized;
+    public DoubleValue AverageQualityNormalized {
+      get { return averageQualityNormalized; }
       set {
-        if (bestQuality != value) {
-          if (bestQuality != null) DeregisterQualityEvents();
-          bestQuality = value;
-          if (bestQuality != null) RegisterQualityEvents();
+        if (averageQualityNormalized != value) {
+          averageQualityNormalized = value;
           OnQualityChanged();
         }
@@ -29 +28 @@
 
     [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; }
+    private DoubleArray qualitiesNormalized;
+    public DoubleArray QualitiesNormalized {
+      get { return qualitiesNormalized; }
+      set {
+        if (qualitiesNormalized != value) {
+          qualitiesNormalized = value;
+        }
+      }
+    }
+
+    [Storable]
+    private DoubleArray bestQualities;
+    public DoubleArray BestQualities {
+      get { return bestQualities; }
+      set {
+        if (bestQualities != value) {
+          bestQualities = value;
+        }
+      }
+    }
+
+    [Storable]
+    private DoubleArray averageQualities;
+    public DoubleArray AverageQualities {
+      get { return averageQualities; }
+      set { averageQualities = value; }
+    }
+
+    [Storable]
+    private DoubleArray worstQualities;
+    public DoubleArray WorstQualities {
+      get { return worstQualities; }
+      set { worstQualities = value; }
+    }
+
+    [Storable]
+    private DoubleArray qualityVariances;
+    public DoubleArray QualityVariances {
+      get { return qualityVariances; }
+      set { qualityVariances = value; }
+    }
+
+    [Storable]
+    private DoubleArray qualityStandardDeviations;
+    public DoubleArray QualityStandardDeviations {
+      get { return qualityStandardDeviations; }
+      set { qualityStandardDeviations = value; }
+    }
+
+    [Storable]
+    private ItemList<TimeSpanValue> averageExecutionTimes;
+    public ItemList<TimeSpanValue> AverageExecutionTimes {
+      get { return averageExecutionTimes; }
+      set { averageExecutionTimes = value; }
     }
 
@@ -88 +109 @@
       : base(null, algorithm.GetType()) {
       this.Optimize = true; // root must always be optimized
-      this.BestQuality = new DoubleValue();
       this.parameters = new Dictionary<string, IItem>();
 
       PopulateParameterConfigurations(algorithm);
-      Initialize();
     }
     public ParameterConfigurationTree() {
-      Initialize();
     }
     [StorableConstructor]
@@ -101 +119 @@
     protected ParameterConfigurationTree(ParameterConfigurationTree original, Cloner cloner)
       : base(original, cloner) {
-      this.bestQuality = cloner.Clone(original.BestQuality);
-      this.averageQuality = cloner.Clone(original.averageQuality);
-      this.worstQuality = cloner.Clone(original.worstQuality);
-      this.qualityStandardDeviation = cloner.Clone(original.qualityStandardDeviation);
-      this.qualityVariance = cloner.Clone(original.qualityVariance);
-      this.averageExecutionTime = cloner.Clone(original.averageExecutionTime);
+      this.bestQualities = cloner.Clone(original.BestQualities);
+      this.averageQualities = cloner.Clone(original.averageQualities);
+      this.worstQualities = cloner.Clone(original.worstQualities);
+      this.qualityStandardDeviations = cloner.Clone(original.qualityStandardDeviations);
+      this.qualityVariances = cloner.Clone(original.qualityVariances);
+      this.averageExecutionTimes = cloner.Clone(original.averageExecutionTimes);
       this.repetitions = cloner.Clone(original.repetitions);
       this.runs = cloner.Clone(original.runs);
@@ -113 +131 @@
         this.parameters.Add(p.Key, cloner.Clone(p.Value));
       }
-      Initialize();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -120 +137 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      Initialize();
     }
     #endregion
 
-    private void Initialize() {
-      //if (algorithm != null) RegisterAlgorithmEvents();
-      if (bestQuality != null) RegisterQualityEvents();
-    }
-
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
-      values.Add("RunsAverageExecutionTime", AverageExecutionTime);
+      values.Add("RunsAverageExecutionTimes", AverageExecutionTimes);
       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("RunsBestQualities", BestQualities);
+      values.Add("RunsAverageQualities", AverageQualities);
+      values.Add("RunsWorstQualities", WorstQualities);
+      values.Add("RunsQualityVariances", QualityVariances);
+      values.Add("RunsQualityStandardDeviations", QualityStandardDeviations);
+      values.Add("QualitiesNormalized", QualitiesNormalized);
+      values.Add("AverageQualityNormalized", AverageQualityNormalized);
       values.Add("Runs", Runs);
     }
@@ -147 +160 @@
 
     #region Events
-    //public event EventHandler AlgorithmChanged;
-    //private void OnAlgorithmChanged() {
-    //  var handler = AlgorithmChanged;
-    //  if (handler != null) handler(this, EventArgs.Empty);
-    //}
     public event EventHandler QualityChanged;
     private void OnQualityChanged() {
       var handler = QualityChanged;
       if (handler != null) handler(this, EventArgs.Empty);
-    }
-
-    //private void RegisterAlgorithmEvents() {
-
-    //}
-    //private void DeregisterAlgorithmEvents() {
-
-    //}
-    private void RegisterQualityEvents() {
-      BestQuality.ValueChanged += new EventHandler(Quality_ValueChanged);
-    }
-    private void DeregisterQualityEvents() {
-      BestQuality.ValueChanged -= new EventHandler(Quality_ValueChanged);
     }