Changeset 7328

Timestamp:

01/14/12 21:33:47 (13 years ago)

Author:

sforsten

Message:

#1669: corrected mistake while generating the dataset

Location:

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

Files:

• KeijzerFunctionFifteen.cs (modified) (2 diffs)
• KeijzerFunctionSixteen.cs (modified) (2 diffs)
• KeijzerFunctionThirteen.cs (modified) (2 diffs)
• KeijzerFunctionTwelve.cs (modified) (2 diffs)

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

@@ -40 +40 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(2500, 2601);
+      testPartition = new IntRange(20, 120);
     }
 
@@ -58 +58 @@
       DoubleRange range = new DoubleRange(-3, 3);
 
-      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
-      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
-
       for (int i = 0; i < InputVariable.Count; i++) {
-        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
-        dataList[i].AddRange(testData[i]);
+        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
       }
 

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

@@ -40 +40 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(2500, 2601);
+      testPartition = new IntRange(20, 120);
     }
 
@@ -58 +58 @@
       DoubleRange range = new DoubleRange(-3, 3);
 
-      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
-      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
-
       for (int i = 0; i < InputVariable.Count; i++) {
-        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
-        dataList[i].AddRange(testData[i]);
+        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
       }
 

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

@@ -40 +40 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(2500, 2601);
+      testPartition = new IntRange(20, 120);
     }
 
@@ -58 +58 @@
       DoubleRange range = new DoubleRange(-3, 3);
 
-      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
-      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
-
       for (int i = 0; i < InputVariable.Count; i++) {
-        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
-        dataList[i].AddRange(testData[i]);
+        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
       }
 

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

@@ -40 +40 @@
       inputVariables = new List<string>() { "X", "Y" };
       trainingPartition = new IntRange(0, 20);
-      testPartition = new IntRange(2500, 2601);
+      testPartition = new IntRange(20, 120);
     }
 
@@ -58 +58 @@
       DoubleRange range = new DoubleRange(-3, 3);
 
-      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
-      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
-
       for (int i = 0; i < InputVariable.Count; i++) {
-        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(2500, range));
-        dataList[i].AddRange(testData[i]);
+        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(5000, range));
       }