Changeset 15475 for stable

Timestamp:

11/15/17 14:37:01 (7 years ago)

Author:

mkommend

Message:

#2853: Merged r15461 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs

@@ -37 +37 @@
           + "Function: f(x, y) = xy + sin((x - 1)(y - 1))" + Environment.NewLine
           + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
-          + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
-          + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+          + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
+          + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
+          + "Comments: Reduced test set compared to original publication!";
       }
     }
@@ -47 +48 @@
     protected override int TrainingPartitionEnd { get { return 20; } }
     protected override int TestPartitionStart { get { return 20; } }
-    protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
+    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
     public int Seed { get; private set; }
 
@@ -57 +58 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
+      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
 

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs

@@ -36 +36 @@
         + "Function: f(x, y) = x³ / 5 + y³ / 2 - y - x" + Environment.NewLine
         + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
-        + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
-        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
+        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
+        + "Comments: Reduced test set compared to original publication!";
       }
     }
@@ -46 +47 @@
     protected override int TrainingPartitionEnd { get { return 20; } }
     protected override int TestPartitionStart { get { return 20; } }
-    protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
+    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
     public int Seed { get; private set; }
 
@@ -56 +57 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
+      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
 

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs

@@ -36 +36 @@
         + "Function: f(x, y) = 8 / (2 + x² + y²)" + Environment.NewLine
         + "range(train): 20 Train cases x,y = rnd(-3, 3)" + Environment.NewLine
-        + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
-        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
+        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
+        + "Comments: Reduced test set compared to original publication!";
       }
     }
@@ -46 +47 @@
     protected override int TrainingPartitionEnd { get { return 20; } }
     protected override int TestPartitionStart { get { return 20; } }
-    protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
+    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
     public int Seed { get; private set; }
 
@@ -58 +59 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
+      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
 

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs

@@ -36 +36 @@
         + "Function: f(x, y) = 6 * sin(x) * cos(y)" + Environment.NewLine
         + "range(train): 20 Train cases x,y = rnd(-3, 3)" + Environment.NewLine
-        + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
-        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
+        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
+        + "Comments: Reduced test set compared to original publication!";
       }
     }
@@ -46 +47 @@
     protected override int TrainingPartitionEnd { get { return 20; } }
     protected override int TestPartitionStart { get { return 20; } }
-    protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
+    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
     public int Seed { get; private set; }
 
@@ -56 +57 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
+      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
 

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs

@@ -36 +36 @@
                + "Function: f(x, y) = x^4 - x³ + y² / 2 - y" + Environment.NewLine
                + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
-               + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
-               + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
+               + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
+               + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
+               + "Comments: Reduced test set compared to original publication!";
       }
     }
@@ -46 +47 @@
     protected override int TrainingPartitionEnd { get { return 20; } }
     protected override int TestPartitionStart { get { return 20; } }
-    protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
+    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
     public int Seed { get; private set; }
 
@@ -56 +57 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
+      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };