Changeset 7127 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

Timestamp:

12/05/11 17:03:49 (12 years ago)

Author:

sforsten

Message:

#1669:
-Spatial co-evolution benchmark has been added
-Benchmarks of Trent McConaghy have been added
-2 Classification benchmarks have been added (Mammography and Iris dataset)
-Training and test set include now all samples from the dataset
-Load button and combo box are now disabled when the algorithm is running

File:

• branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs (modified) (2 diffs)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

@@ -44 +44 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      importButton.Enabled = !Locked && !ReadOnly && Content != null;
+      ImportButton.Enabled = !Locked && !ReadOnly && Content != null;
+      LoadButton.Enabled = !Locked && !ReadOnly && Content != null;
+      BenchmarkComboBox.Enabled = !Locked && !ReadOnly && Content != null;
     }
 
@@ -59 +61 @@
 
     private void loadButton_Click(object sender, EventArgs e) {
-      if (benchmarkComboBox.SelectedItem != null)
-        Content.ProblemData = ((IDataAnalysisBenchmarkProblemDataGenerator)benchmarkComboBox.SelectedItem).GenerateProblemData();
+      if (BenchmarkComboBox.SelectedItem != null)
+        Content.ProblemData = ((IDataAnalysisBenchmarkProblemDataGenerator)BenchmarkComboBox.SelectedItem).GenerateProblemData();
     }
 
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      benchmarkComboBox.Items.Clear();
-      benchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.Name, new NaturalStringComparer()).ToArray());
-      if (benchmarkComboBox.Items.Count > 0)
-        benchmarkComboBox.SelectedIndex = 0;
+      BenchmarkComboBox.Items.Clear();
+      BenchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.Name, new NaturalStringComparer()).ToArray());
+      if (BenchmarkComboBox.Items.Count > 0)
+        BenchmarkComboBox.SelectedIndex = 0;
     }