Context Navigation

← Previous Change
Next Change →

Keijzer

Timestamp:

09/14/12 18:58:15 (12 years ago)

Author:

gkronber

Message:

#1847 merged r8205:8635 from trunk into branch

Location:

branches/GP-MoveOperators

Files:

: 1 deleted
: 3 edited
: 14 copied

Legend:

: Unmodified
: Added
: Removed

branches/GP-MoveOperators

Property svn:ignore

old	new
21	21	protoc.exe
22	22	_ReSharper.HeuristicLab 3.3 Tests
	23	Google.ProtocolBuffers-2.4.1.473.dll

Property svn:mergeinfo changed

/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/branches/ScatterSearch (trunk integration) (added)	merged: 7787,7789,7793,7806,7815,7821-7822,7954,8086,8171,8299,8303-8307,8319-8320,8322,8327-8328,8331-8332
/trunk/sources	merged: 8208-8212,8220-8226,8231,8233,8238,8240-8241,8245-8246,8252-8256,8280,8282-8283,8288-8289,8295-8296,8298,8309-8311,8317,8323-8325,8333-8335,8338-8346,8348,8351,8353,8355,8357-8358,8361,8363-8364,8366-8368,8371-8372,8375,8380-8381,8386,8396-8399,8401,8403-8405,8413,8416-8419,8421,8433,8435,8439,8448,8452-8453,8455,8463-8465,8467,8469,8471,8473-8476,8478,8482,8484-8485,8489,8491,8493-8495,8497,8523,8528,8530-8531,8533,8536,8542-8543,8547-8554,8559-8568,8571,8573,8575,8577-8578,8580-8584,8587-8588,8592-8602,8604-8621,8623-8625,8628,8630,8632-8635

branches/GP-MoveOperators/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs

-                      r7860
+                      r8660
   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
 …
     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() {
 …
       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);

branches/GP-MoveOperators/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.cs

-                      r7860
+                      r8660
+    }
     public override Uri WebLink {
       get { return new Uri("http://groups.csail.mit.edu/EVO-DesignOpt/GPBenchmarks/"); }
+      get { return new Uri("http://www.gpbenchmarks.org/wiki/index.php?title=Problem_Classification#Keijzer"); }
+    }
     public override string ReferencePublication {
       get { return ""; }
+      get { return "McDermott et al., 2012 \"Genetic Programming Needs Better Benchmarks\", in Proc. of GECCO 2012."; }
+    }
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      descriptorList.Add(new KeijzerFunctionOne());
+      descriptorList.Add(new KeijzerFunctionTwo());
+      descriptorList.Add(new KeijzerFunctionThree());
       descriptorList.Add(new KeijzerFunctionFour());
       descriptorList.Add(new KeijzerFunctionFive());
 …
       descriptorList.Add(new KeijzerFunctionEight());
       descriptorList.Add(new KeijzerFunctionNine());
+      descriptorList.Add(new KeijzerFunctionTen());
       descriptorList.Add(new KeijzerFunctionEleven());
       descriptorList.Add(new KeijzerFunctionTwelve());
 …
       descriptorList.Add(new KeijzerFunctionFourteen());
       descriptorList.Add(new KeijzerFunctionFifteen());
-      descriptorList.Add(new KeijzerFunctionSixteen());
       return descriptorList;
+    }

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8660 for branches/GP-MoveOperators/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer

Legend:

branches/GP-MoveOperators

branches/GP-MoveOperators/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs

branches/GP-MoveOperators/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.cs

Download in other formats: