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

Timestamp:

12/30/10 22:50:59 (14 years ago)

Author:

cneumuel

Message:

#1215

• enhanced combinations generator (now with batchruns!)
• fixed ActualNames for metaopt-alg
• added penalty for invalid solution-candidates (algs which throw exceptions)
• migrated to .NET 4.0

File:

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

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

@@ -14 +14 @@
   [StorableClass]
   public class ParameterConfigurationTree : ValueConfiguration, IEnumerable {
-    //[Storable]
-    //public EngineAlgorithm Algorithm {
-    //  get { return (EngineAlgorithm)base.ActualValue.Value; }
-    //  set {
-    //    base.ActualValue.Value = value;
-    //  }
-    //}
-
     [Storable]
     private DoubleValue bestQuality;
@@ -83 +75 @@
       get { return runs; }
       set { runs = value; }
-     }
-
+    }
+
+    [Storable]
     protected IDictionary<string, IItem> parameters;
     public IDictionary<string, IItem> Parameters {
@@ -109 +102 @@
       : 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.repetitions = cloner.Clone(original.repetitions);
+      this.runs = cloner.Clone(original.runs);
       this.parameters = new Dictionary<string, IItem>();
       foreach (var p in original.parameters) {
@@ -182 +182 @@
     }
 
-    public Experiment GenerateExperiment(IAlgorithm algorithm) {
+    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
       Experiment experiment = new Experiment();
       foreach (IValueConfiguration combination in this) {
         IAlgorithm clonedAlg = (IAlgorithm)algorithm.Clone();
-        clonedAlg.Name = combination.ToParameterInfoString();
+        clonedAlg.Name = combination.ParameterInfoString;
         combination.Parameterize(clonedAlg);
-        experiment.Optimizers.Add(clonedAlg);
+        clonedAlg.StoreAlgorithmInEachRun = false;
+        if (createBatchRuns) {
+          BatchRun batchRun = new BatchRun(string.Format("BatchRun: {0}", combination.ParameterInfoString));
+          batchRun.Algorithm = clonedAlg;
+          batchRun.Repetitions = repetitions;
+          experiment.Optimizers.Add(batchRun);
+        } else {
+          experiment.Optimizers.Add(clonedAlg);
+        }
       }
       return experiment;
+    }
+
+    public Experiment GenerateExperiment(IAlgorithm algorithm) {
+      return GenerateExperiment(algorithm, false, 0);
     }