Changes in branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs [8535:8574]

File:

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

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

@@ -166 +166 @@
       get { return parameters; }
       set { parameters = value; }
-    }
-
-    [Storable]
-    private double experimentGenerationProgress;
-    public double ExperimentGenerationProgress {
-      get { return experimentGenerationProgress; }
-      private set {
-        if (experimentGenerationProgress != value) {
-          experimentGenerationProgress = value;
-          OnExperimentGenerationProgressChanged();
-        }
-      }
     }
 
@@ -291 +279 @@
       CombinationsCount = GetCombinationCount(0);
     }
-
-    public event EventHandler ExperimentGenerationProgressChanged;
-    private void OnExperimentGenerationProgressChanged() {
-      var handler = ExperimentGenerationProgressChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     #endregion
 
@@ -308 +290 @@
 
       algorithm.CollectParameterValues(this.Parameters);
-    }
-
-    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 (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;
-    }
-
-    public Experiment GenerateExperiment(IAlgorithm algorithm) {
-      return GenerateExperiment(algorithm, false, 0, null, CancellationToken.None);
-    }
-
-    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
-      return GenerateExperiment(algorithm, createBatchRuns, repetitions, null, CancellationToken.None);
     }