Changeset 7031

Timestamp:

11/22/11 09:53:30 (12 years ago)

Author:

sforsten

Message:

#1669: A few mistakes have been corrected. All benchmark problems now generate problem data without throwing an error.

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) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs (modified) (2 diffs)
• RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs (modified) (1 diff)
• RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)

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

@@ -74 +74 @@
     <Compile Include="RegressionBenchmarks\Korns\KornFunctionOne.cs" />
     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFour.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTwelve.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionEleven.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTen.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionNine.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionEight.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionSeven.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionSix.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionFive.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionFour.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionThree.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTwo.cs" />
-    <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionOne.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\KotanchekFunction.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwelve.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEleven.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTen.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionNine.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEight.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSeven.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSix.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFive.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFour.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionThree.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwo.cs" />
+    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionOne.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs" />
     <Compile Include="Generator\RegressionBenchmark.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\RationalPolynomialThreeDimensional.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\RationalPolynomialTwoDimensional.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\RippleFunction.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\SalustowiczFunctionOneDimensional.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\SalustowiczFunctionTwoDimensional.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\SineCosineFunction.cs" />
-    <Compile Include="RegressionBenchmarks\Vladislavleva et al\UnwrappedBallFunctionFiveDimensional.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialThreeDimensional.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialTwoDimensional.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\RippleFunction.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionOneDimensional.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionTwoDimensional.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\SineCosineFunction.cs" />
+    <Compile Include="RegressionBenchmarks\Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -36 +36 @@
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
-      inputVariables = new List<string>() { "X", "Y", "Z" };
+      inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 101);
       testPartition = new IntRange(102, 1103);

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

@@ -36 +36 @@
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
-      inputVariables = new List<string>() { "X", "Y", "Z" };
+      inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
       testPartition = new IntRange(21, 621);

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

@@ -28 +28 @@
 
     public KeijzerFunctionSix() {
-      Name = "Keijzer 6 f(x) = (30 * x * y) / ((x - 10)  * y^2)";
+      Name = "Keijzer 6 f(x) = (30 * x * z) / ((x - 10)  * y^2)";
       Description = "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
         + "Authors: Maarten Keijzer" + Environment.NewLine
-        + "Function: f(x) = (30 * x * y) / ((x - 10)  * y^2)" + Environment.NewLine
-        + "range(train): 1000 points x,y = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
-        + "range(test): 10000 points x,y = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
+        + "Function: f(x) = (30 * x * z) / ((x - 10)  * y^2)" + Environment.NewLine
+        + "range(train): 1000 points x,z = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
+        + "range(test): 10000 points x,z = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
@@ -48 +48 @@
         y = data[1][i];
         z = data[2][i];
-        results.Add((30 * x * y) / ((x - 10) * Math.Pow(y, 2)));
+        results.Add((30 * x * z) / ((x - 10) * Math.Pow(y, 2)));
       }
       return results;

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

@@ -36 +36 @@
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
-      inputVariables = new List<string>() { "X", "Y", "Z" };
+      inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
       testPartition = new IntRange(21, 621);

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

@@ -36 +36 @@
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
-      inputVariables = new List<string>() { "X", "Y", "Z" };
+      inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
       testPartition = new IntRange(21, 621);

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

@@ -36 +36 @@
         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
       targetVariable = "F";
-      inputVariables = new List<string>() { "X", "Y", "Z" };
+      inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
       testPartition = new IntRange(21, 621);