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

Timestamp:

04/17/11 18:22:28 (13 years ago)

Author:

cneumuel

Message:

#1215

• support for maximization problems
• made base level algorithms stoppable
• optimization for multiple goals possible (AverageQuality, AverageDeviation, AverageEvaluatedSolutions)
• lots of fixes

File:

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

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

@@ -16 +16 @@
 
     [Storable]
-    private DoubleValue averageQualityNormalized;
-    public DoubleValue AverageQualityNormalized {
-      get { return averageQualityNormalized; }
-      set {
-        if (averageQualityNormalized != value) {
-          averageQualityNormalized = value;
+    private DoubleValue quality;
+    public DoubleValue Quality {
+      get { return quality; }
+      set {
+        if (quality != value) {
+          quality = value;
           OnQualityChanged();
         }
@@ -28 +28 @@
 
     [Storable]
-    private DoubleArray qualitiesNormalized;
-    public DoubleArray QualitiesNormalized {
-      get { return qualitiesNormalized; }
-      set {
-        if (qualitiesNormalized != value) {
-          qualitiesNormalized = value;
-        }
-      }
-    }
-
+    private DoubleArray normalizedQualityAverages;
+    public DoubleArray NormalizedQualityAverages {
+      get { return normalizedQualityAverages; }
+      set {
+        if (normalizedQualityAverages != value) {
+          normalizedQualityAverages = value;
+        }
+      }
+    }
+
+    [Storable]
+    private DoubleArray normalizedQualityDeviations;
+    public DoubleArray NormalizedQualityDeviations {
+      get { return normalizedQualityDeviations; }
+      set {
+        if (normalizedQualityDeviations != value) {
+          normalizedQualityDeviations = value;
+        }
+      }
+    }
+
+    [Storable]
+    private DoubleArray normalizedEvaluatedSolutions;
+    public DoubleArray NormalizedEvaluatedSolutions {
+      get { return normalizedEvaluatedSolutions; }
+      set {
+        if (normalizedEvaluatedSolutions != value) {
+          normalizedEvaluatedSolutions = value;
+        }
+      }
+    }
+    
     [Storable]
     private DoubleArray bestQualities;
@@ -85 +107 @@
 
     [Storable]
+    private DoubleArray averageEvaluatedSolutions;
+    public DoubleArray AverageEvaluatedSolutions {
+      get { return averageEvaluatedSolutions; }
+      set { averageEvaluatedSolutions = value; }
+    }
+
+    [Storable]
     private IntValue repetitions;
     public IntValue Repetitions {
@@ -116 +145 @@
       }
     }
-
-    //[Storable]
-    //protected string name;
-    //public string Name {
-    //  get { return name; }
-    //  set { name = value; }
-    //}
 
     #region constructors and cloning
@@ -136 +158 @@
       algproblemitem.ProblemParameter.Value = problem;
       this.discoverValidValues = false;
-      
+
       this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Algorithm", algproblemitem.AlgorithmParameter));
       this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Problem", algproblemitem.ProblemParameter));
@@ -145 +167 @@
     protected ParameterConfigurationTree(ParameterConfigurationTree original, Cloner cloner)
       : base(original, cloner) {
-      this.averageQualityNormalized = cloner.Clone(original.averageQualityNormalized);
-      this.qualitiesNormalized = cloner.Clone(original.qualitiesNormalized);
+      this.quality = cloner.Clone(original.quality);
+      this.normalizedQualityAverages = cloner.Clone(original.normalizedQualityAverages);
+      this.normalizedQualityDeviations = cloner.Clone(original.normalizedQualityDeviations);
+      this.normalizedEvaluatedSolutions = cloner.Clone(original.normalizedEvaluatedSolutions);
       this.bestQualities = cloner.Clone(original.BestQualities);
       this.averageQualities = cloner.Clone(original.averageQualities);
@@ -153 +177 @@
       this.qualityVariances = cloner.Clone(original.qualityVariances);
       this.averageExecutionTimes = cloner.Clone(original.averageExecutionTimes);
+      this.averageEvaluatedSolutions = cloner.Clone(original.averageEvaluatedSolutions);
       this.repetitions = cloner.Clone(original.repetitions);
       this.runs = cloner.Clone(original.runs);
@@ -171 +196 @@
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
       values.Add("RunsAverageExecutionTimes", AverageExecutionTimes);
+      values.Add("RunsAverageEvaluatedSolutions", AverageEvaluatedSolutions);
       values.Add("Repetitions", Repetitions);
       values.Add("RunsBestQualities", BestQualities);
@@ -177 +203 @@
       values.Add("RunsQualityVariances", QualityVariances);
       values.Add("RunsQualityStandardDeviations", QualityStandardDeviations);
-      values.Add("QualitiesNormalized", QualitiesNormalized);
-      values.Add("AverageQualityNormalized", AverageQualityNormalized);
+      values.Add("QualitiesNormalized", NormalizedQualityAverages);
+      values.Add("AverageQualityNormalized", Quality);
       values.Add("Runs", Runs);
     }
@@ -209 +235 @@
 
       algorithm.CollectParameterValues(this.Parameters);
-      //((IProblem)ProblemConfiguration.ActualValue.Value).CollectParameterValues(this.Parameters);
-      //CollectAlgorithmParameterValues((IAlgorithm)AlgorithmConfiguration.ActualValue.Value, parameters);
-    }
-
-    //protected virtual void CollectAlgorithmParameterValues(IAlgorithm algorithm, IDictionary<string, IItem> values) {
-    //  var algorithmValues = new Dictionary<string, IItem>();
-    //  algorithm.CollectParameterValues(algorithmValues);
-    //  foreach (var value in algorithmValues) {
-    //    values.Add("Algorithm." + value.Key, value.Value);
-    //  }
-    //}
+    }
 
     public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
@@ -294 +310 @@
         var sb = new StringBuilder();
         if (!string.IsNullOrEmpty(algorithmInfo)) {
-          sb.Append("Algorithm: ");
+          sb.Append("Algorithm (");
           sb.Append(algorithmInfo);
+          sb.Append(")");
         }
         if (!string.IsNullOrEmpty(problemInfo)) {
           if (sb.Length > 0)
             sb.Append(", ");
-          sb.Append("Problem: ");
+          sb.Append("Problem( ");
           sb.Append(problemInfo);
+          sb.Append(")");
         }
         return sb.ToString();
@@ -311 +329 @@
       ProblemConfiguration.CollectOptimizedParameterNames(parameterNames, string.Empty);
     }
-
-   
   }
 }