Changeset 7085 for branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks

Timestamp:

11/28/11 13:47:28 (13 years ago)

Author:

sforsten

Message:

#1669: branch has been merged with the trunk in revision 7081 and methods in RegressionBenchmark have been renamed.

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Generator/RegressionBenchmark.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFour.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/ChemicalOne.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/Housing.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/TowerProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/KotanchekFunction.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RippleFunction.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionOneDimensional.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionTwoDimensional.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs (modified) (1 diff)

branches/RegressionBenchmarks

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen

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

@@ -83 +83 @@
     }
 
-    public static List<List<double>> AllCombinationsOf(List<List<double>> sets) {
+    public static List<List<double>> GenerateAllCombinationsOfValuesInLists(List<List<double>> sets) {
 
       var combinations = new List<List<double>>();
@@ -91 +91 @@
 
       foreach (var set in sets.Skip(1))
-        combinations = AddExtraSet(combinations, set);
+        combinations = AddListToCombinations(combinations, set);
 
       combinations = (from i in Enumerable.Range(0, sets.Count)
@@ -100 +100 @@
     }
 
-    private static List<List<double>> AddExtraSet
+    private static List<List<double>> AddListToCombinations
          (List<List<double>> combinations, List<double> set) {
       var newCombinations = from value in set

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

@@ -58 +58 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

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

@@ -38 +38 @@
       inputVariables = new List<string>() { "X" };
       trainingPartition = new IntRange(0, 21);
-      testPartition = new IntRange(22, 2023);
+      testPartition = new IntRange(22, 2022);
     }
 

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

@@ -58 +58 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

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

@@ -58 +58 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

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

@@ -58 +58 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(range, 0.01);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/ChemicalOne.cs

@@ -31 +31 @@
 
     public ChemicalOne() {
-      Name = "Chemical-I";
+      Name = "RealWorldProblem Chemical-I";
       //Description = "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
       //  + "Authors: Maarten Keijzer" + Environment.NewLine

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/Housing.cs

@@ -31 +31 @@
 
     public Housing() {
-      Name = "Housing";
+      Name = "RealWorldProblem Housing";
       //Description = "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
       //  + "Authors: Maarten Keijzer" + Environment.NewLine

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/RealWorldProblems/TowerProblem.cs

@@ -31 +31 @@
 
     public TowerProblem() {
-      Name = "TowerProblem";
+      Name = "RealWorldProblem TowerProblem";
       //Description = "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
       //  + "Authors: Maarten Keijzer" + Environment.NewLine

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/KotanchekFunction.cs

@@ -28 +28 @@
 
     public KotanchekFunction() {
-      Name = "Kotanchek";
+      Name = "Vladislavleva Kotanchek";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
@@ -61 +61 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(new DoubleRange(-0.2, 4.2), 0.1);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
       for (int i = 0; i < InputVariable.Count; i++) {
         dataList[i].AddRange(testData[i]);

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs

@@ -28 +28 @@
 
     public RationalPolynomial() {
-      Name = "RatPol3D";
+      Name = "Vladislavleva RatPol3D";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
@@ -65 +65 @@
       };
 
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs

@@ -28 +28 @@
 
     public RationalPolynomialTwoDimensional() {
-      Name = "RatPol2D";
+      Name = "Vladislavleva RatPol2D";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
@@ -62 +62 @@
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
 
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
       for (int i = 0; i < InputVariable.Count; i++) {
         dataList[i].AddRange(testData[i]);

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RippleFunction.cs

@@ -28 +28 @@
 
     public RippleFunction() {
-      Name = "Ripple";
+      Name = "Vladislavleva Ripple";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionOneDimensional.cs

@@ -28 +28 @@
 
     public SalutowiczFunctionOneDimensional() {
-      Name = "Salutowicz";
+      Name = "Vladislavleva Salutowicz";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

@@ -28 +28 @@
 
     public SalutowiczFunctionTwoDimensional() {
-      Name = "Salutowicz2D";
+      Name = "Vladislavleva Salutowicz2D";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
@@ -65 +65 @@
       };
 
-      trainingData = RegressionBenchmark.AllCombinationsOf(trainingData);
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      trainingData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(trainingData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs

@@ -28 +28 @@
 
     public SineCosineFunction() {
-      Name = "SineCosine";
+      Name = "Vladislavleva SineCosine";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine
@@ -61 +61 @@
       List<double> oneVariableTestData = RegressionBenchmark.GenerateSteps(new DoubleRange(-0.05, 6.05), 0.02);
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = RegressionBenchmark.AllCombinationsOf(testData);
+      testData = RegressionBenchmark.GenerateAllCombinationsOfValuesInLists(testData);
 
       for (int i = 0; i < InputVariable.Count; i++) {

branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

@@ -29 +29 @@
 
     public UnwrappedBallFunctionFiveDimensional() {
-      Name = "UBall5D";
+      Name = "Vladislavleva UBall5D";
       Description = "Paper: Order of Nonlinearity as a Complexity Measure for Models Generated by Symbolic Regression via Pareto Genetic Programming " + Environment.NewLine
         + "Authors: Ekaterina J. Vladislavleva, Member, IEEE, Guido F. Smits, Member, IEEE, and Dick den Hertog" + Environment.NewLine

@@ -4 +4 @@
 *.suo
 *.vsp
+Doxygen
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -16 +18 @@
 bin
 protoc.exe
-HeuristicLab.ExtLibs.6.0.ReSharper.user
-Doxygen