Changeset 7405 for branches

Timestamp:

01/24/12 16:23:47 (13 years ago)

Author:

sforsten

Message:

#1669:

• changed TestPartition and trainingPartition of SpatialCoevolution
• put a method from RegressionBenchmark to BreimanOne

Location:

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

Files:

• RegressionBenchmarks/Other/BreimanOne.cs (modified) (1 diff)
• RegressionBenchmarks/Other/SpatialCoevolution.cs (modified) (2 diffs)
• RegressionGenerator/RegressionBenchmark.cs (modified) (1 diff)

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

@@ -65 +65 @@
       List<List<double>> dataList = new List<List<double>>();
       List<int> values = new List<int>() { -1, 1 };
-      dataList.Add(RegressionBenchmark.GenerateUniformIntegerDistribution(values, testPartition.End));
+      dataList.Add(BreimanOne.GenerateUniformIntegerDistribution(values, testPartition.End));
       values.Add(0);
       for (int i = 0; i < inputVariables.Count - 1; i++) {
-        dataList.Add(RegressionBenchmark.GenerateUniformIntegerDistribution(values, testPartition.End));
+        dataList.Add(BreimanOne.GenerateUniformIntegerDistribution(values, testPartition.End));
       }
 
       return dataList;
     }
+
+    public static List<double> GenerateUniformIntegerDistribution(List<int> classes, int amount) {
+      List<double> values = new List<double>();
+      for (int i = 0; i < amount; i++) {
+        values.Add(classes[rand.Next(0, classes.Count)]);
+      }
+      return values;
+    }
   }
 }

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, 338);
-      testPartition = new IntRange(338, 676);
+      trainingPartition = new IntRange(0, 676);
+      testPartition = new IntRange(676, 976);
     }
 
@@ -58 +58 @@
       List<List<double>> dataList = new List<List<double>>();
 
-      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(new DoubleRange(-5, 5), 0.4);
+      DoubleRange range = new DoubleRange(-5, 5);
+
+      List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.4);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      dataList = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
+
+      for (int i = 0; i < inputVariables.Count; i++) {
+        dataList.Add(testData[i]);
+        dataList[i].AddRange(RegressionBenchmark.GenerateUniformDistributedValues(1000, range));
+      }
 
       return dataList;

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionGenerator/RegressionBenchmark.cs

@@ -109 +109 @@
       return newCombinations.ToList();
     }
-
-    public static List<double> GenerateUniformIntegerDistribution(List<int> classes, int amount) {
-      List<double> values = new List<double>();
-      for (int i = 0; i < amount; i++) {
-        values.Add(rand.Next(0, classes.Count));
-      }
-      return values;
-    }
   }
 }