Changeset 8535 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding.Views/3.3/CreateExperimentDialogV2.cs

Timestamp:

08/29/12 09:22:21 (12 years ago)

Author:

jkarder

Message:

#1853:

• enhanced combinations count calculation
• restructured code
• minor code improvements
• added license information

File:

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

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

@@ -36 +36 @@
 namespace HeuristicLab.Encodings.ParameterConfigurationEncoding.Views {
   public partial class CreateExperimentDialogV2 : Form {
+    private readonly IAlgorithm algorithm;
     private readonly Progress progress;
-    private readonly IAlgorithm algorithm;
     private ParameterConfigurationTree parameterConfigurationTree;
     private bool createBatchRun;
     private int repetitions;
     private IEngine engine;
-    private Task generation;
+    private Task experimentGenerator;
     private CancellationTokenSource cts;
     private Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> problemInstanceProviders;
@@ -93 +93 @@
         parameterConfigurationTreeView.Content = parameterConfigurationTree = new ParameterConfigurationTree(algorithm, algorithm.Problem);
         parameterConfigurationTree.ExperimentGenerationProgressChanged += (o, args) => progress.ProgressValue = parameterConfigurationTree.ExperimentGenerationProgress;
+        parameterConfigurationTree.CombinationsCountChanged += (o, args) => UpdateCombinationsCount();
         new ProgressView(parameterConfigurationTreeView, progress) { CancelTimeoutMs = 10000 };
       } else {
@@ -101 +102 @@
 
     private void CreateExperimentDialogV2_FormClosing(object sender, FormClosingEventArgs e) {
-      if (generation != null) e.Cancel = true;
+      if (experimentGenerator != null) e.Cancel = true;
     }
 
@@ -160 +161 @@
           }
         }
-      }
-    }
-
-    private void calculateCombinationsButton_Click(object sender, EventArgs e) {
-      long parameterConfigurationsCnt = parameterConfigurationTree.GetCombinationCount(0);
-      int problemInstanceCnt = 1 + selectedProblemInstanceProviders.Values.Sum(x => x.Count);
-      combinationsTextBox.Text = (parameterConfigurationsCnt * problemInstanceCnt).ToString();
+        UpdateCombinationsCount();
+      }
     }
 
     private void okButton_Click(object sender, System.EventArgs e) {
       configurationTabControl.SelectedTab = parameterConfigurationTabPage;
-      generation = Task.Factory.StartNew(() => {
+      experimentGenerator = Task.Factory.StartNew(() => {
         StartProgressView();
         var engineAlgorithm = algorithm as EngineAlgorithm;
@@ -181 +177 @@
         finally { FinishProgressView(); }
       }, cts.Token);
-      generation.ContinueWith(t => {
-        generation = null;
+      experimentGenerator.ContinueWith(t => {
+        experimentGenerator = null;
         CloseDialog();
       }, TaskContinuationOptions.OnlyOnRanToCompletion);
-      generation.ContinueWith(t => {
-        generation = null;
+      experimentGenerator.ContinueWith(t => {
+        experimentGenerator = null;
         if (t.IsCanceled) cts = new CancellationTokenSource();
         if (t.IsFaulted) {
@@ -201 +197 @@
       repetitionsNumericUpDown.Enabled = state;
       engineComboBox.Enabled = state;
-      calculateCombinationsButton.Enabled = state;
       okButton.Enabled = state;
       cancelButton.Enabled = state;
@@ -222 +217 @@
     }
 
+    private void UpdateCombinationsCount() {
+      var combinationsCount = parameterConfigurationTree.CombinationsCount;
+      var instanceCount = 1 + selectedProblemInstanceProviders.Values.Sum(x => x.Count);
+      combinationsCountLabel.Text = (combinationsCount * instanceCount).ToString();
+    }
+
     private void StartProgressView() {
       if (InvokeRequired) {