Changeset 7031


Ignore:
Timestamp:
11/22/11 09:53:30 (8 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:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj

    r7025 r7031  
    7474    <Compile Include="RegressionBenchmarks\Korns\KornFunctionOne.cs" />
    7575    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFour.cs" />
    76     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTwelve.cs" />
    77     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionEleven.cs" />
    78     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTen.cs" />
    79     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionNine.cs" />
    80     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionEight.cs" />
    81     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionSeven.cs" />
    82     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionSix.cs" />
    83     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionFive.cs" />
    84     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionFour.cs" />
    85     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionThree.cs" />
    86     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionTwo.cs" />
    87     <Compile Include="RegressionBenchmarks\Nguyen et al\NguyenFunctionOne.cs" />
    88     <Compile Include="RegressionBenchmarks\Vladislavleva et al\KotanchekFunction.cs" />
     76    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwelve.cs" />
     77    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEleven.cs" />
     78    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTen.cs" />
     79    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionNine.cs" />
     80    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEight.cs" />
     81    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSeven.cs" />
     82    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSix.cs" />
     83    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFive.cs" />
     84    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFour.cs" />
     85    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionThree.cs" />
     86    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwo.cs" />
     87    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionOne.cs" />
     88    <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs" />
    8989    <Compile Include="Generator\RegressionBenchmark.cs" />
    90     <Compile Include="RegressionBenchmarks\Vladislavleva et al\RationalPolynomialThreeDimensional.cs" />
    91     <Compile Include="RegressionBenchmarks\Vladislavleva et al\RationalPolynomialTwoDimensional.cs" />
    92     <Compile Include="RegressionBenchmarks\Vladislavleva et al\RippleFunction.cs" />
    93     <Compile Include="RegressionBenchmarks\Vladislavleva et al\SalustowiczFunctionOneDimensional.cs" />
    94     <Compile Include="RegressionBenchmarks\Vladislavleva et al\SalustowiczFunctionTwoDimensional.cs" />
    95     <Compile Include="RegressionBenchmarks\Vladislavleva et al\SineCosineFunction.cs" />
    96     <Compile Include="RegressionBenchmarks\Vladislavleva et al\UnwrappedBallFunctionFiveDimensional.cs" />
     90    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialThreeDimensional.cs" />
     91    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialTwoDimensional.cs" />
     92    <Compile Include="RegressionBenchmarks\Vladislavleva\RippleFunction.cs" />
     93    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionOneDimensional.cs" />
     94    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionTwoDimensional.cs" />
     95    <Compile Include="RegressionBenchmarks\Vladislavleva\SineCosineFunction.cs" />
     96    <Compile Include="RegressionBenchmarks\Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
    9797  </ItemGroup>
    9898  <ItemGroup>
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs

    r7025 r7031  
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
    38       inputVariables = new List<string>() { "X", "Y", "Z" };
     38      inputVariables = new List<string>() { "X" };
    3939      trainingPartition = new IntRange(0, 101);
    4040      testPartition = new IntRange(102, 1103);
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs

    r7025 r7031  
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
    38       inputVariables = new List<string>() { "X", "Y", "Z" };
     38      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    4040      testPartition = new IntRange(21, 621);
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs

    r7025 r7031  
    2828
    2929    public KeijzerFunctionSix() {
    30       Name = "Keijzer 6 f(x) = (30 * x * y) / ((x - 10)  * y^2)";
     30      Name = "Keijzer 6 f(x) = (30 * x * z) / ((x - 10)  * y^2)";
    3131      Description = "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
    3232        + "Authors: Maarten Keijzer" + Environment.NewLine
    33         + "Function: f(x) = (30 * x * y) / ((x - 10)  * y^2)" + Environment.NewLine
    34         + "range(train): 1000 points x,y = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
    35         + "range(test): 10000 points x,y = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
     33        + "Function: f(x) = (30 * x * z) / ((x - 10)  * y^2)" + Environment.NewLine
     34        + "range(train): 1000 points x,z = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
     35        + "range(test): 10000 points x,z = rnd(-1, 1), y = rnd(1, 2)" + Environment.NewLine
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
     
    4848        y = data[1][i];
    4949        z = data[2][i];
    50         results.Add((30 * x * y) / ((x - 10) * Math.Pow(y, 2)));
     50        results.Add((30 * x * z) / ((x - 10) * Math.Pow(y, 2)));
    5151      }
    5252      return results;
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs

    r7025 r7031  
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
    38       inputVariables = new List<string>() { "X", "Y", "Z" };
     38      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    4040      testPartition = new IntRange(21, 621);
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs

    r7025 r7031  
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
    38       inputVariables = new List<string>() { "X", "Y", "Z" };
     38      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    4040      testPartition = new IntRange(21, 621);
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs

    r7025 r7031  
    3636        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
    3737      targetVariable = "F";
    38       inputVariables = new List<string>() { "X", "Y", "Z" };
     38      inputVariables = new List<string>() { "X", "Y" };
    3939      trainingPartition = new IntRange(0, 20);
    4040      testPartition = new IntRange(21, 621);
Note: See TracChangeset for help on using the changeset viewer.