Changeset 8430 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionSix.cs

Timestamp:

08/08/12 14:04:17 (12 years ago)

Author:

mkommend

Message:

#1081: Intermediate commit of trunk updates - interpreter changes must be redone.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionSix.cs (modified) (2 diffs)

branches/HeuristicLab.TimeSeries

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Korns/KornsFunctionSix.cs

@@ -33 +33 @@
         + "Authors: Michael F. Korns" + Environment.NewLine
         + "Function: y = 1.3 + (0.13 * sqrt(X0))" + Environment.NewLine
-        + "Real Numbers: 3.45, -.982, 100.389, and all other real constants" + Environment.NewLine
-        + "Row Features: x1, x2, x9, and all other features" + Environment.NewLine
-        + "Binary Operators: +, -, *, /" + Environment.NewLine
-        + "Unary Operators: sqrt, square, cube, cos, sin, tan, tanh, log, exp" + Environment.NewLine
+        + "Binary Operators: +, -, *, % (protected division)" + Environment.NewLine
+        + "Unary Operators: sqrt, square, cube, cos, sin, tan, tanh, ln(|x|) (protected log), exp" + Environment.NewLine
+        + "Constants: random finit 64-bit IEEE double" + Environment.NewLine
         + "\"Our testing regimen uses only statistical best practices out-of-sample testing techniques. "
         + "We test each of the test cases on matrices of 10000 rows by 1 to 5 columns with no noise. "
@@ -48 +47 @@
     protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 5000; } }
-    protected override int TestPartitionStart { get { return 5000; } }
-    protected override int TestPartitionEnd { get { return 10000; } }
+    protected override int TrainingPartitionEnd { get { return 10000; } }
+    protected override int TestPartitionStart { get { return 10000; } }
+    protected override int TestPartitionEnd { get { return 20000; } }
 
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 50).ToList());
-      }
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 50).ToList()); // note: range is only [0,50] to prevent NaN values (deviates from gp benchmark paper)
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -50, 50).ToList()); 
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -50, 50).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -50, 50).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -50, 50).ToList()); 
 
       double x0;

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab.TimeSeries-3.3