Changeset 6991 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RationalPolynomial.cs

Timestamp:

11/14/11 17:08:32 (12 years ago)

Author:

sforsten

Message:

#1669: First version with a simpler design as discussed with Michael Kommenda has been implemented and will be tested soon. Currently only the KotanchekFunction.cs is changed accordingly. Other benchmarks are going to follow soon.

The classes for the different distributions are not needed any longer. Static methods in RegressionBenchmark replace them.

File:

• branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RationalPolynomial.cs (modified) (4 diffs)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RationalPolynomial.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
@@ -32 +31 @@
 
     public RationalPolynomial() {
-      Name = "Rational polynomial (3d)";
-      TargetVariable = "y";
-      Inputvariables = new Dictionary<string, IntRange>() {
-        {"x1", new IntRange(0, 2)},
-        {"x2", new IntRange(1, 2)},
-        {"x3", new IntRange(1, 2)}
-      };
-      AmountOfPoints = 4000;
-      TrainingPartition = new IntRange(0, 2667);
-      TestPartition = new IntRange(TrainingPartition.End, AmountOfPoints);
+      //Name = "Rational polynomial (3d)";
+      //TargetVariable = "y";
+
+      //var inputVariables = new Dictionary<string, RandomDistribution>() {
+      //  {"x1", new UniformalDistribution(0, 2)},
+      //  {"x2", new UniformalDistribution(1, 2)},
+      //  {"x3", new UniformalDistribution(1, 2)}
+      //};
+
+      //TestData = new DatasetDefinition(2667, inputVariables);
+      //TrainingData = new DatasetDefinition(1333, inputVariables);
     }
 
@@ -54 +54 @@
     #endregion
 
-    protected override double CalculateFunction(Dictionary<string, IList<double>> data, List<string> vars) {
+    protected override double CalculateFunction(Dictionary<string, IList<double>> data) {
       double x1 = data[vars.ElementAt(0)].Last();
       double x2 = data[vars.ElementAt(1)].Last();
@@ -60 +60 @@
       return (30 * (x1 - 1) * (x3 - 1)) / ((x1 - 10) * Math.Pow(x2, 2));
     }
+
+    public override List<string> InputVariable {
+      get { throw new NotImplementedException(); }
+    }
+
+    public override string TargetVariable {
+      get { throw new NotImplementedException(); }
+    }
+
+    public override Data.IntRange TrainingPartition {
+      get { throw new NotImplementedException(); }
+    }
+
+    public override Data.IntRange TestPartition {
+      get { throw new NotImplementedException(); }
+    }
+
+    protected override Dictionary<string, IList<double>> GenerateInput(Dictionary<string, IList<double>> data) {
+      throw new NotImplementedException();
+    }
   }
 }