Changeset 7328


Ignore:
Timestamp:
01/14/12 21:33:47 (8 years ago)
Author:
sforsten
Message:

#1669: corrected mistake while generating the dataset

Location:
branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs

    r7307 r7328  
    4040      inputVariables = new List<string>() { "X", "Y" };
    4141      trainingPartition = new IntRange(0, 20);
    42       testPartition = new IntRange(2500, 2601);
     42      testPartition = new IntRange(20, 120);
    4343    }
    4444
     
    5858      DoubleRange range = new DoubleRange(-3, 3);
    5959
    60       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
    61       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    62       testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
    63 
    6460      for (int i = 0; i < InputVariable.Count; i++) {
    65         dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
    66         dataList[i].AddRange(testData[i]);
     61        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
    6762      }
    6863
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs

    r7307 r7328  
    4040      inputVariables = new List<string>() { "X", "Y" };
    4141      trainingPartition = new IntRange(0, 20);
    42       testPartition = new IntRange(2500, 2601);
     42      testPartition = new IntRange(20, 120);
    4343    }
    4444
     
    5858      DoubleRange range = new DoubleRange(-3, 3);
    5959
    60       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
    61       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    62       testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
    63 
    6460      for (int i = 0; i < InputVariable.Count; i++) {
    65         dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
    66         dataList[i].AddRange(testData[i]);
     61        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
    6762      }
    6863
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs

    r7307 r7328  
    4040      inputVariables = new List<string>() { "X", "Y" };
    4141      trainingPartition = new IntRange(0, 20);
    42       testPartition = new IntRange(2500, 2601);
     42      testPartition = new IntRange(20, 120);
    4343    }
    4444
     
    5858      DoubleRange range = new DoubleRange(-3, 3);
    5959
    60       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
    61       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    62       testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
    63 
    6460      for (int i = 0; i < InputVariable.Count; i++) {
    65         dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
    66         dataList[i].AddRange(testData[i]);
     61        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
    6762      }
    6863
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs

    r7307 r7328  
    4040      inputVariables = new List<string>() { "X", "Y" };
    4141      trainingPartition = new IntRange(0, 20);
    42       testPartition = new IntRange(2500, 2601);
     42      testPartition = new IntRange(20, 120);
    4343    }
    4444
     
    5858      DoubleRange range = new DoubleRange(-3, 3);
    5959
    60       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
    61       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    62       testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
    63 
    6460      for (int i = 0; i < InputVariable.Count; i++) {
    65         dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
    66         dataList[i].AddRange(testData[i]);
     61        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
    6762      }
    6863
Note: See TracChangeset for help on using the changeset viewer.