Changeset 8430 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.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/Keijzer/KeijzerFunctionNine.cs (modified) (3 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/Keijzer/KeijzerFunctionNine.cs

@@ -27 +27 @@
   public class KeijzerFunctionNine : ArtificialRegressionDataDescriptor {
 
-    public override string Name { get { return "Keijzer 9 f(x) = sqrt(x)"; } }
+    public override string Name { get { return "Keijzer 9 f(x) = arcsinh(x)  i.e. ln(x + sqrt(x² + 1))"; } }
     public override string Description {
       get {
         return "Paper: Improving Symbolic Regression with Interval Arithmetic and Linear Scaling" + Environment.NewLine
         + "Authors: Maarten Keijzer" + Environment.NewLine
-        + "Function: f(x) = sqrt(x)" + Environment.NewLine
+        + "Function: f(x) = arcsinh(x)  i.e. ln(x + sqrt(x² + 1))" + Environment.NewLine
         + "range(train): x = [0:1:100]" + Environment.NewLine
         + "range(test): x = [0:0.1:100]" + Environment.NewLine
@@ -42 +42 @@
     protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 101; } }
-    protected override int TestPartitionStart { get { return 101; } }
-    protected override int TestPartitionEnd { get { return 1102; } }
+    protected override int TrainingPartitionEnd { get { return 100; } }
+    protected override int TestPartitionStart { get { return 100; } }
+    protected override int TestPartitionEnd { get { return 1100; } }
 
     protected override List<List<double>> GenerateValues() {
@@ -55 +55 @@
       for (int i = 0; i < data[0].Count; i++) {
         x = data[0][i];
-        results.Add(Math.Sqrt(x));
+        results.Add(Math.Log(x + Math.Sqrt(x*x + 1)));
       }
       data.Add(results);

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