Changeset 7428

Timestamp:

01/30/12 16:22:12 (13 years ago)

Author:

sforsten

Message:

#1669:

• change in test partition of some Keijzer benchmark problems
• change in test and training partition in spatial co-evolution benchmark problem

Location:

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

Files:

• Keijzer/KeijzerFunctionEight.cs (modified) (1 diff)
• Keijzer/KeijzerFunctionFifteen.cs (modified) (1 diff)
• Keijzer/KeijzerFunctionSixteen.cs (modified) (1 diff)
• Keijzer/KeijzerFunctionThirteen.cs (modified) (1 diff)
• Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)
• Other/SpatialCoevolution.cs (modified) (2 diffs)

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

@@ -38 +38 @@
       targetVariable = "F";
       inputVariables = new List<string>() { "X" };
-      trainingPartition = new IntRange(0, 101);
-      testPartition = new IntRange(101, 1103);
+      trainingPartition = new IntRange(0, 100);
+      testPartition = new IntRange(100, 1091);
     }
 

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, 2600);
+      testPartition = new IntRange(2500, 5000);
     }
 

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, 2600);
+      testPartition = new IntRange(2500, 5000);
     }
 

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, 2600);
+      testPartition = new IntRange(2500, 5000);
     }
 

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, 2600);
+      testPartition = new IntRange(2500, 5000);
     }
 

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Other/SpatialCoevolution.cs

@@ -40 +40 @@
       targetVariable = "F";
       inputVariables = new List<string>() { "X", "Y" };
-      trainingPartition = new IntRange(0, 676);
-      testPartition = new IntRange(676, 976);
+      trainingPartition = new IntRange(0, 1000);
+      testPartition = new IntRange(1000, 1676);
     }
 
@@ -65 +65 @@
 
       for (int i = 0; i < inputVariables.Count; i++) {
-        dataList.Add(testData[i]);
-        dataList[i].AddRange(RegressionBenchmark.GenerateUniformDistributedValues(1000, range));
+        dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(1000, range));
+        dataList[i].AddRange(testData[i]);
       }