Changeset 8524 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

Timestamp:

08/27/12 10:39:03 (12 years ago)

Author:

jkarder

Message:

#1853:

• added problem instance selection to CreateExperimentDialog
• adopted experiment creation
• minor code improvements

File:

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

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

@@ -31 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding {
-  // todo: storable, name, descr, ...
+  [Item("ParameterConfigurationTree", "Represents a parameter configuration.")]
   [StorableClass]
   public class ParameterConfigurationTree : ParameterizedValueConfiguration, IEnumerable {
-
     [Storable]
     private DoubleValue quality;
@@ -180 +180 @@
     }
 
-    #region constructors and cloning
-    public ParameterConfigurationTree(IAlgorithm algorithm, IProblem problem)
-      : base(null, algorithm.GetType(), false) {
-      this.Optimize = false;
-      this.IsOptimizable = false;
-      this.parameters = new Dictionary<string, IItem>();
-      this.Name = algorithm.ItemName;
-
-      var algproblemitem = new AlgorithmProblemItem();
-      algproblemitem.AlgorithmParameter.Value = algorithm;
-      algproblemitem.ProblemParameter.Value = problem;
-      this.discoverValidValues = false;
-
-      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Algorithm", algproblemitem.AlgorithmParameter));
-      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Problem", algproblemitem.ProblemParameter));
-
-      // problems can be modified in the list of problem instances, so the parameters which are not Optimize=true, 
-      // must not be modifiable in the parameter configuration tree. otherwise the parameter values would be ambiguous
-      ProblemConfiguration.ValuesReadOnly = true;
-    }
-    public ParameterConfigurationTree() { }
+    #region Constructors and Cloning
     [StorableConstructor]
     protected ParameterConfigurationTree(bool deserializing) : base(deserializing) { }
@@ -225 +205 @@
       }
     }
+    public ParameterConfigurationTree() : base() { }
+    public ParameterConfigurationTree(IAlgorithm algorithm, IProblem problem)
+      : base(null, algorithm.GetType(), false) {
+      this.Optimize = false;
+      this.IsOptimizable = false;
+      this.parameters = new Dictionary<string, IItem>();
+      this.Name = algorithm.ItemName;
+
+      var algproblemitem = new AlgorithmProblemItem();
+      algproblemitem.AlgorithmParameter.Value = algorithm;
+      algproblemitem.ProblemParameter.Value = problem;
+      this.discoverValidValues = false;
+
+      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Algorithm", algproblemitem.AlgorithmParameter));
+      this.parameterConfigurations.Add(new SingleValuedParameterConfiguration("Problem", algproblemitem.ProblemParameter));
+
+      // problems can be modified in the list of problem instances, so the parameters which are not Optimize=true, 
+      // must not be modifiable in the parameter configuration tree. otherwise the parameter values would be ambiguous
+      ProblemConfiguration.ValuesReadOnly = true;
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ParameterConfigurationTree(this, cloner);
     }
+
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
@@ -274 +276 @@
     public override void Parameterize(IParameterizedItem item) {
       this.parameters.Clear();
-      var algorithm = item as IAlgorithm;
+      var algorithm = (IAlgorithm)item;
       var problem = algorithm.Problem;
 
@@ -283 +285 @@
     }
 
-    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions, CancellationToken ct) {
+    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions, Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> problemInstances, CancellationToken ct) {
       Experiment experiment = new Experiment();
+      var algorithms = new List<IAlgorithm>(1 + problemInstances.Values.Count) { (IAlgorithm)algorithm.Clone() };
+      foreach (var provider in problemInstances) {
+        foreach (var descriptor in provider.Value) {
+          var alg = (IAlgorithm)algorithm.Clone();
+          ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
+          algorithms.Add(alg);
+        }
+      }
       ExperimentGenerationProgress = 0;
-      foreach (ParameterizedValueConfiguration combination in this) {
-        ct.ThrowIfCancellationRequested();
-        IAlgorithm clonedAlg = (IAlgorithm)algorithm.Clone();
-        clonedAlg.Name = combination.ParameterInfoString;
-        combination.Parameterize(clonedAlg);
-        clonedAlg.StoreAlgorithmInEachRun = false;
-        if (createBatchRuns) {
-          BatchRun batchRun = new BatchRun(string.Format("BatchRun: {0}", combination.ParameterInfoString));
-          batchRun.Optimizer = clonedAlg;
-          batchRun.Repetitions = repetitions;
-          experiment.Optimizers.Add(batchRun);
-        } else {
-          experiment.Optimizers.Add(clonedAlg);
-        }
-        ExperimentGenerationProgress = (double)experiment.Optimizers.Count / this.GetCombinationCount(0);
+      foreach (var alg in algorithms) {
+        foreach (ParameterizedValueConfiguration combination in this) {
+          ct.ThrowIfCancellationRequested();
+          var clonedAlg = (IAlgorithm)alg.Clone();
+          clonedAlg.Name = combination.ParameterInfoString;
+          combination.Parameterize(clonedAlg);
+          clonedAlg.StoreAlgorithmInEachRun = false;
+          if (createBatchRuns) {
+            BatchRun batchRun = new BatchRun(string.Format("BatchRun: {0}", combination.ParameterInfoString));
+            batchRun.Optimizer = clonedAlg;
+            batchRun.Repetitions = repetitions;
+            experiment.Optimizers.Add(batchRun);
+          } else {
+            experiment.Optimizers.Add(clonedAlg);
+          }
+          ExperimentGenerationProgress = (double)experiment.Optimizers.Count / (this.GetCombinationCount(0) * algorithms.Count);
+        }
       }
       return experiment;
@@ -306 +318 @@
 
     public Experiment GenerateExperiment(IAlgorithm algorithm) {
-      return GenerateExperiment(algorithm, false, 0, CancellationToken.None);
+      return GenerateExperiment(algorithm, false, 0, null, CancellationToken.None);
     }
 
     public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
-      return GenerateExperiment(algorithm, createBatchRuns, repetitions, CancellationToken.None);
+      return GenerateExperiment(algorithm, createBatchRuns, repetitions, null, CancellationToken.None);
     }