Changeset 7044 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

11/22/11 16:52:43 (13 years ago)

Author:

sforsten

Message:

#1669: real world problems have been added

Location:

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs (modified) (3 diffs)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (3 diffs)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -28 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -119 +116 @@
       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.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -27 +25 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -116 +113 @@
       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.");
-    }
   }
 }