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

File:

• branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/CreateExperimentDialogV2.cs (modified) (4 diffs)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/CreateExperimentDialogV2.cs

@@ -37 +37 @@
   public partial class CreateExperimentDialogV2 : Form {
     private readonly IAlgorithm algorithm;
+    private readonly ExperimentFactory experimentFactory;
     private readonly Progress progress;
     private ParameterConfigurationTree parameterConfigurationTree;
@@ -69 +70 @@
       progress.CancelRequested += (sender, args) => cts.Cancel();
       progress.ProgressValueChanged += (sender, args) => progress.Status = string.Format("Generating experiment. Please be patient. ({0} %)", (int)(progress.ProgressValue * 100));
+      experimentFactory = new ExperimentFactory();
       cts = new CancellationTokenSource();
     }
@@ -92 +94 @@
       if (algorithm.Problem != null) {
         parameterConfigurationTreeView.Content = parameterConfigurationTree = new ParameterConfigurationTree(algorithm, algorithm.Problem);
-        parameterConfigurationTree.ExperimentGenerationProgressChanged += (o, args) => progress.ProgressValue = parameterConfigurationTree.ExperimentGenerationProgress;
         parameterConfigurationTree.CombinationsCountChanged += (o, args) => UpdateCombinationsCount();
+        experimentFactory.ExperimentGenerationProgressChanged += (o, args) => progress.ProgressValue = experimentFactory.ExperimentGenerationProgress;
         new ProgressView(parameterConfigurationTreeView, progress) { CancelTimeoutMs = 10000 };
       } else {
@@ -172 +174 @@
         if (engineAlgorithm != null) engineAlgorithm.Engine = engine;
         try {
-          Experiment = createBatchRun ? parameterConfigurationTree.GenerateExperiment(engineAlgorithm, true, repetitions, selectedProblemInstanceProviders, cts.Token)
-                                      : parameterConfigurationTree.GenerateExperiment(engineAlgorithm, false, 0, selectedProblemInstanceProviders, cts.Token);
+          Experiment = createBatchRun ? experimentFactory.GenerateExperiment(engineAlgorithm, parameterConfigurationTree, true, repetitions, selectedProblemInstanceProviders, cts.Token)
+                                      : experimentFactory.GenerateExperiment(engineAlgorithm, parameterConfigurationTree, false, 0, selectedProblemInstanceProviders, cts.Token);
         }
         finally { FinishProgressView(); }