Changeset 6968 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

11/08/11 13:18:49 (13 years ago)

Author:

sforsten

Message:

#1669: First version which can automatically generate data for some problems from ​http://www.vanillamodeling.com/

Location:

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Files:

• Classification/ClassificationProblem.cs (modified) (2 diffs)
• Clustering/ClusteringProblem.cs (modified) (2 diffs)
• DataAnalysisProblem.cs (modified) (2 diffs)
• Regression/RegressionProblem.cs (modified) (2 diffs)
• TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs (modified) (2 diffs)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -43 +45 @@
       ProblemData = problemData;
     }
+
+    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
+      throw new System.NotImplementedException();
+    }
+
+    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
+      return ApplicationManager.Manager.GetInstances<IClassificationBenchmarkProblemDataGenerator>();
+    }
   }
 }

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -43 +44 @@
       ProblemData = problemData;
     }
+
+    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
+      throw new System.NotImplementedException();
+    }
+
+    public override System.Collections.Generic.IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
+      return ApplicationManager.Manager.GetInstances<IClusteringBenchmarkProblemDataGenerator>();
+    }
   }
 }

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -92 +93 @@
 
     public abstract void ImportProblemDataFromFile(string fileName);
+
+    public abstract void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
+
+    public abstract IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
   }
 }

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -43 +46 @@
       ProblemData = problemData;
     }
+
+    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
+      return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
+    }
+
+    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
+      if (!(benchmarkGenerator is IRegressionBenchmarkProblemDataGenerator)) {
+        throw new ArgumentException("BenchmarkGenerator is not an IRegressionBenchmarkProblemDataGenerator.");
+      }
+
+      IDataAnalysisProblemData problemData = benchmarkGenerator.GenerateProblemData();
+
+      if (problemData is IRegressionProblemData)
+        ProblemData = (IRegressionProblemData)problemData;
+      else
+        throw new InvalidCastException("ProblemDataGenerator didn't return an IRegressionProblemData.");
+    }
   }
 }

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -43 +45 @@
       ProblemData = problemData;
     }
+
+    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
+      throw new System.NotImplementedException();
+    }
+
+    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
+      return ApplicationManager.Manager.GetInstances<ITimeSeriesBenchmarkProblemDataGenerator>();
+    }
   }
 }