Changeset 7025 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

11/21/11 16:23:48 (13 years ago)

Author:

sforsten

Message:

#1669: benchmark problems of Nguyen, Korns and Keijzer from ​http://groups.csail.mit.edu/EVO-DesignOpt/GPBenchmarks/ have been added. The benchmark problems from ​http://www.vanillamodeling.com/ have been adapted to the ones from Vladislavleva.

Not all benchmarks are working correctly so far, but they will be tested soon.

File:

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

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -58 +59 @@
     private void loadButton_Click(object sender, EventArgs e) {
       if (benchmarkComboBox.SelectedItem != null)
-        Content.CreateProblemDataFromBenchmark((IDataAnalysisBenchmarkProblemDataGenerator)benchmarkComboBox.SelectedItem);
+        Content.ProblemData = ((IDataAnalysisBenchmarkProblemDataGenerator)benchmarkComboBox.SelectedItem).GenerateProblemData();
     }
 
@@ -64 +65 @@
       base.OnContentChanged();
       benchmarkComboBox.Items.Clear();
-      benchmarkComboBox.Items.AddRange(Content.GetBenchmarkProblemDataGenerators().OrderBy(b => b.ItemName).ToArray());
+      benchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.ItemName).ToArray());
       if (benchmarkComboBox.Items.Count > 0)
         benchmarkComboBox.SelectedIndex = 0;
     }
+
+    protected IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
+      if (Content is IRegressionProblem)
+        return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
+      else if (Content is IClassificationProblem)
+        return ApplicationManager.Manager.GetInstances<IClassificationBenchmarkProblemDataGenerator>();
+      else if (Content is ITimeSeriesPrognosisProblem)
+        return ApplicationManager.Manager.GetInstances<ITimeSeriesBenchmarkProblemDataGenerator>();
+      else if (Content is IClusteringProblem)
+        return ApplicationManager.Manager.GetInstances<IClusteringBenchmarkProblemDataGenerator>();
+      return new List<IDataAnalysisBenchmarkProblemDataGenerator>();
+    }
   }
 }