Changeset 7096

Timestamp:

11/29/11 17:04:29 (12 years ago)

Author:

sforsten

Message:

#1669: Poly-10 benchmark has been added and two small bug fixes.

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs (modified) (2 diffs)
• RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs (modified) (1 diff)
• RegressionBenchmarks/Poli (added)
• RegressionBenchmarks/Poli/PloyTen.cs (added)

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj

@@ -158 +158 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="RegressionBenchmarks\Poli\PloyTen.cs" />
     <Compile Include="RegressionBenchmarks\RealWorldProblems\ChemicalOne.cs" />
     <Compile Include="RegressionBenchmarks\RealWorldProblems\Housing.cs" />

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs

@@ -34 +34 @@
         + "range(train): x = [0:1:100]" + Environment.NewLine
         + "range(test): x = [0:0.1:100]" + Environment.NewLine
-        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine + Environment.NewLine
+        + "Note: It starts with 1 to avoid log(0), which is minus infinity!";
       targetVariable = "F";
       inputVariables = new List<string>() { "X" };
@@ -53 +54 @@
     protected override List<List<double>> GenerateInput() {
       List<List<double>> dataList = new List<List<double>>();
-      dataList.Add(RegressionBenchmark.GenerateSteps(new DoubleRange(0, 100), 1));
-      dataList[0].AddRange(RegressionBenchmark.GenerateSteps(new DoubleRange(0, 100), 0.1));
+      dataList.Add(RegressionBenchmark.GenerateSteps(new DoubleRange(1, 100), 1));
+      dataList[0].AddRange(RegressionBenchmark.GenerateSteps(new DoubleRange(1, 100), 0.1));
 
       return dataList;

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs

@@ -28 +28 @@
 
     public NguyenFunctionOne() {
-      Name = "Nguyen F2 = x^3 + x^2 + x";
+      Name = "Nguyen F1 = x^3 + x^2 + x";
       Description = "Paper: Semantically-based Crossover in Genetic Programming: Application to Real-valued Symbolic Regression" + Environment.NewLine
         + "Authors: Nguyen Quang Uy · Nguyen Xuan Hoai · Michael O’Neill · R.I. McKay · Edgar Galvan-Lopez" + Environment.NewLine
-        + "Function: F2 = x^3 + x^2 + x" + Environment.NewLine
+        + "Function: F1 = x^3 + x^2 + x" + Environment.NewLine
         + "Fitcases: 20 random points ⊆ [-1, 1]" + Environment.NewLine
         + "Non-terminals: +, -, *, /, sin, cos, exp, log (protected version)" + Environment.NewLine