Changeset 17541 for branches

Timestamp:

05/14/20 12:25:24 (4 years ago)

Author:

pfleck

Message:

#3040 Added a new benchmark instance.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (1 diff)
• Regression/VectorData/VectorDataInstanceProvider.cs (modified) (1 diff)
• Regression/VectorData/VectorDataTestOne.cs (modified) (7 diffs)
• Regression/VectorData/VectorDataTestTwo.cs (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestOne.cs) (7 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -262 +262 @@
     <Compile Include="Regression\VectorData\RandomExtensions.cs" />
     <Compile Include="Regression\VectorData\VectorDataInstanceProvider.cs" />
+    <Compile Include="Regression\VectorData\VectorDataTestTwo.cs" />
     <Compile Include="Regression\VectorData\VectorDataTestOne.cs" />
     <Compile Include="Regression\Vladislavleva\KotanchekFunction.cs" />

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataInstanceProvider.cs

@@ -54 +54 @@
         new VectorDataTestOneC(rand.Next()),
         new VectorDataTestOneD(rand.Next()),
+        new VectorDataTestTwoA(rand.Next()),
+        new VectorDataTestTwoB(rand.Next()),
+        //new VectorDataTestTwoC(rand.Next()),
+        //new VectorDataTestTwoD(rand.Next()),
         new AzzaliBenchmark1(rand.Next()),
         new AzzaliBenchmark2(rand.Next()),

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestOne.cs

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.Core;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
 using MathNet.Numerics.Statistics;
@@ -32 +31 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public abstract class VectorDataTestBase : ArtificialRegressionDataDescriptor {
+  public abstract class VectorDataTestOne : ArtificialRegressionDataDescriptor {
 
     protected const int Rows = 100;
@@ -48 +47 @@
     public int Seed { get; private set; }
 
-    protected VectorDataTestBase()
+    protected VectorDataTestOne()
       : this((int)DateTime.Now.Ticks) { }
-    protected VectorDataTestBase(int seed)
+    protected VectorDataTestOne(int seed)
       : base() {
       Seed = seed;
@@ -97 +96 @@
   }
 
-  public class VectorDataTestOneA : VectorDataTestBase {
+  public class VectorDataTestOneA : VectorDataTestOne {
     public override string Name {
-      get { return "Vector Data Test - I a (Y = X1 * sum(V1) + X2 * avg(V2)"; }
+      get { return "Vector Data Test - I [fully-constrained]: Y = X1 * sum(V1) + X2 * mean(V2)"; }
     }
 
@@ -115 +114 @@
   }
 
-  public class VectorDataTestOneB : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I b (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  public class VectorDataTestOneB : VectorDataTestOne {
+    public override string Name { get { return "Vector Data Test - I [row-constrained]: Y = X1 * sum(V1) + X2 * mean(V2)"; } }
 
     public VectorDataTestOneB() : base() { }
@@ -131 +130 @@
   }
 
-  public class VectorDataTestOneC : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I c (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  public class VectorDataTestOneC : VectorDataTestOne {
+    public override string Name { get { return "Vector Data Test - I [column-constrained]: Y = X1 * sum(V1) + X2 * mean(V2)"; } }
 
     public VectorDataTestOneC() : base() { }
@@ -152 +151 @@
   }
 
-  public class VectorDataTestOneD : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I d (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  public class VectorDataTestOneD : VectorDataTestOne {
+    public override string Name { get { return "Vector Data Test - I [unconstrained]: Y = X1 * sum(V1) + X2 * mean(V2)"; } }
 
     public VectorDataTestOneD() : base() { }

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestTwo.cs

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.Core;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
 using MathNet.Numerics.Statistics;
@@ -32 +31 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public abstract class VectorDataTestBase : ArtificialRegressionDataDescriptor {
+  public abstract class VectorDataTestTwo : ArtificialRegressionDataDescriptor {
 
     protected const int Rows = 100;
@@ -48 +47 @@
     public int Seed { get; private set; }
 
-    protected VectorDataTestBase()
+    protected VectorDataTestTwo()
       : this((int)DateTime.Now.Ticks) { }
-    protected VectorDataTestBase(int seed)
+    protected VectorDataTestTwo(int seed)
       : base() {
       Seed = seed;
@@ -81 +80 @@
         v2 = rand.NextDoubleVector(3, 5, v2Length);
 
-        y = x1 * v1.Sum() + x2 * v2.Mean();
+        y = x1 * v1.PointwiseExp().PointwiseMultiply(v2 + x2).Sum();
 
         x1Column.Add(x1);
@@ -97 +96 @@
   }
 
-  public class VectorDataTestOneA : VectorDataTestBase {
+  public class VectorDataTestTwoA : VectorDataTestTwo {
     public override string Name {
-      get { return "Vector Data Test - I a (Y = X1 * sum(V1) + X2 * avg(V2)"; }
+      get { return "Vector Data Test - II [fully-constrained]: Y = X1 * sum(exp(V1) * (V2 + X2))"; }
     }
 
-    public VectorDataTestOneA() : base() { }
-    public VectorDataTestOneA(int seed) : base(seed) { }
+    public VectorDataTestTwoA() : base() { }
+    public VectorDataTestTwoA(int seed) : base(seed) { }
 
     protected override List<int>[] GetVectorLengths(IRandom rand) {
@@ -115 +114 @@
   }
 
-  public class VectorDataTestOneB : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I b (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  public class VectorDataTestTwoB : VectorDataTestTwo {
+    public override string Name { get { return "Vector Data Test - II [row-constrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
 
-    public VectorDataTestOneB() : base() { }
-    public VectorDataTestOneB(int seed) : base(seed) { }
+    public VectorDataTestTwoB() : base() { }
+    public VectorDataTestTwoB(int seed) : base(seed) { }
 
     protected override List<int>[] GetVectorLengths(IRandom rand) {
@@ -131 +130 @@
   }
 
-  public class VectorDataTestOneC : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I c (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  //public class VectorDataTestTwoC : VectorDataTestTwo {
+  //  public override string Name { get { return "Vector Data Test - II [column-constrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
 
-    public VectorDataTestOneC() : base() { }
-    public VectorDataTestOneC(int seed) : base(seed) { }
+  //  public VectorDataTestTwoC() : base() { }
+  //  public VectorDataTestTwoC(int seed) : base(seed) { }
 
-    protected override List<int>[] GetVectorLengths(IRandom rand) {
-      // length between length 4 and 8; each feature is same length
-      // force two different lengths
-      int v1Length = rand.Next(4, 8);
-      int v2Length;
-      do {
-        v2Length = rand.Next(4, 8);
-      } while (v1Length != v2Length);
-      return new List<int>[2] {
-        Enumerable.Repeat(v1Length, Rows).ToList(),
-        Enumerable.Repeat(v2Length, Rows).ToList()
-      };
-    }
-  }
+  //  protected override List<int>[] GetVectorLengths(IRandom rand) {
+  //    // length between length 4 and 8; each feature is same length
+  //    // force two different lengths
+  //    int v1Length = rand.Next(4, 8);
+  //    int v2Length;
+  //    do {
+  //      v2Length = rand.Next(4, 8);
+  //    } while (v1Length != v2Length);
+  //    return new List<int>[2] {
+  //      Enumerable.Repeat(v1Length, Rows).ToList(),
+  //      Enumerable.Repeat(v2Length, Rows).ToList()
+  //    };
+  //  }
+  //}
 
-  public class VectorDataTestOneD : VectorDataTestBase {
-    public override string Name { get { return "Vector Data Test - I d (Y = X1 * sum(V1) + X2 * avg(V2)"; } }
+  //public class VectorDataTestTwoD : VectorDataTestTwo {
+  //  public override string Name { get { return "Vector Data Test - II [unconstrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
 
-    public VectorDataTestOneD() : base() { }
-    public VectorDataTestOneD(int seed) : base(seed) { }
+  //  public VectorDataTestTwoD() : base() { }
+  //  public VectorDataTestTwoD(int seed) : base(seed) { }
 
-    protected override List<int>[] GetVectorLengths(IRandom rand) {
-      // always random between 4 and 8
-      return new List<int>[2] {
-          Enumerable.Range(0, Rows).Select(i => rand.Next(4, 8)).ToList(),
-          Enumerable.Range(0, Rows).Select(i => rand.Next(4, 8)).ToList()
-        };
-    }
-  }
+  //  protected override List<int>[] GetVectorLengths(IRandom rand) {
+  //    // always random between 4 and 8
+  //    return new List<int>[2] {
+  //        Enumerable.Range(0, Rows).Select(i => rand.Next(4, 8)).ToList(),
+  //        Enumerable.Range(0, Rows).Select(i => rand.Next(4, 8)).ToList()
+  //      };
+  //  }
+  //}
 }