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

Timestamp:

11/14/11 17:08:32 (13 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/KotanchekFunction.cs (modified) (2 diffs)

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

@@ -31 +31 @@
   public class KotanchekFunction : RegressionBenchmark {
 
+    private const string targetVariable = "Y";
+    private static readonly List<string> inputVariables = new List<string>() { "X1", "X2" };
+    private static readonly IntRange trainingPartition = new IntRange(0, 1000);
+    private static readonly IntRange testPartition = new IntRange(1001, 2000);
+
+    public override List<string> InputVariable {
+      get { return inputVariables; }
+    }
+
+    public override string TargetVariable {
+      get { return targetVariable; }
+    }
+
+    public override IntRange TrainingPartition {
+      get { return trainingPartition; }
+    }
+
+    public override IntRange TestPartition {
+      get { return testPartition; }
+    }
+
     public KotanchekFunction() {
       Name = "Kotanchek function (2d)";
-      TargetVariable = "y";
-      Inputvariables = new Dictionary<string, IntRange>() {
-        {"x1", new IntRange(0, 4)},
-        {"x2", new IntRange(0, 4)}
-      };
-      AmountOfPoints = 4000;
-      TrainingPartition = new IntRange(0, 2667);
-      TestPartition = new IntRange(TrainingPartition.End, AmountOfPoints);
     }
 
@@ -53 +66 @@
     #endregion
 
-    protected override double CalculateFunction(Dictionary<string, IList<double>> data, List<string> vars) {
-      double x1 = data[vars.ElementAt(0)].Last();
-      double x2 = data[vars.ElementAt(1)].Last();
-      return Math.Exp(-Math.Pow(x1 - 1, 2)) / (Math.Pow(x2 - 2.5, 2) + 3.2);
+    protected override List<double> CalculateFunction(Dictionary<string, IList<double>> data) {
+      double x1, x2;
+      List<double> results = new List<double>();
+      for (int i = 0; i < TestPartition.End; i++) {
+        x1 = data[InputVariable.ElementAt(0)].ElementAt(i);
+        x2 = data[InputVariable.ElementAt(1)].ElementAt(i);
+        results.Add(Math.Exp(-Math.Pow(x1 - 1, 2)) / (Math.Pow(x2 - 2.5, 2) + 3.2));
+      }
+      return results;
+    }
+
+    protected override Dictionary<string, IList<double>> GenerateInput(Dictionary<string, IList<double>> data) {
+      foreach (var variable in InputVariable) {
+        data[variable] = RegressionBenchmark.generateUniformDistributedValues(TestPartition.End, new DoubleRange(0, 4));
+      }
+      data[TargetVariable] = CalculateFunction(data);
+      return data;
     }
   }