Changeset 17588 for branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestThree.cs

Timestamp:

06/05/20 14:47:55 (4 years ago)

Author:

pfleck

Message:

#3040

• Adapted existing benchmarks (no mean/sum of vectors with zero-mean).
• Added new benchmark for testing windowed aggregations.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestThree.cs (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/VectorData/VectorDataTestTwo.cs) (6 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Random;
 using MathNet.Numerics.Statistics;
-
 using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public abstract class VectorDataTestTwo : ArtificialRegressionDataDescriptor {
+  public abstract class VectorDataTestThree : ArtificialRegressionDataDescriptor {
 
     protected const int Rows = 1000;
@@ -47 +46 @@
     public int Seed { get; private set; }
 
-    protected VectorDataTestTwo()
+    protected VectorDataTestThree()
       : this((int)DateTime.Now.Ticks) { }
-    protected VectorDataTestTwo(int seed)
+    protected VectorDataTestThree(int seed)
       : base() {
       Seed = seed;
@@ -77 +76 @@
         int v1Length = vectorLengths[0][i];
         int v2Length = vectorLengths[1][i];
-        v1 = rand.NextDoubleVector(-2, 2, v1Length);
-        v2 = rand.NextDoubleVector(3, 5, v2Length);
+        v1 = rand.NextIncreasingDoubleVector(1, 4, v1Length);
+        v2 = rand.NextIncreasingDoubleVector(3, 5, v2Length);
 
-        y = x1 * v1.PointwiseExp().PointwiseMultiply(v2 + x2).Sum();
+        //Y = (X1 + sum[2:](V1)) * mean[:-2](V2 + X2)
+        y = (x1 + v1.SubVector(2, v1.Count - 2).Sum() ) * (v2 + x2).SubVector(0, v2.Count - 2).Mean();
 
         x1Column.Add(x1);
@@ -96 +96 @@
   }
 
-  public class VectorDataTestTwoA : VectorDataTestTwo {
+  public class VectorDataTestThreeA : VectorDataTestThree {
     public override string Name {
-      get { return "Vector Data Test - II [fully-constrained]: Y = X1 * sum(exp(V1) * (V2 + X2))"; }
+      get { return "Vector Data Test - III [fully-constrained]: Y = (X1 + sum[2:](V1)) * mean[:-2](V2 + X2)"; }
     }
 
-    public VectorDataTestTwoA() : base() { }
-    public VectorDataTestTwoA(int seed) : base(seed) { }
+    public VectorDataTestThreeA() : base() { }
+    public VectorDataTestThreeA(int seed) : base(seed) { }
 
     protected override List<int>[] GetVectorLengths(IRandom rand) {
       // always same length
-      const int length = 5;
+      const int length = 8;
       return new List<int>[2] {
         Enumerable.Repeat(length, Rows).ToList(),
@@ -114 +114 @@
   }
 
-  public class VectorDataTestTwoB : VectorDataTestTwo {
-    public override string Name { get { return "Vector Data Test - II [row-constrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
+  public class VectorDataTestThreeB : VectorDataTestThree {
+    public override string Name { get { return "Vector Data Test - III [row-constrained]: Y = (X1 + sum[2:](V1)) * mean[:-2](V2 + X2)"; } }
 
-    public VectorDataTestTwoB() : base() { }
-    public VectorDataTestTwoB(int seed) : base(seed) { }
+    public VectorDataTestThreeB() : base() { }
+    public VectorDataTestThreeB(int seed) : base(seed) { }
 
     protected override List<int>[] GetVectorLengths(IRandom rand) {
-      // length between length 4 and 8, same row always the same length
-      var lengths = Enumerable.Range(0, Rows).Select(i => rand.Next(4, 8)).ToList();
+      // length between length 6 and 10, same row always the same length
+      var lengths = Enumerable.Range(0, Rows).Select(i => rand.Next(6, 10)).ToList();
       return new List<int>[2] {
         Enumerable.Range(0, Rows).Select(i => lengths[i]).ToList(),
@@ -130 +130 @@
   }
 
-  //public class VectorDataTestTwoC : VectorDataTestTwo {
-  //  public override string Name { get { return "Vector Data Test - II [column-constrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
+  public class VectorDataTestThreeC : VectorDataTestThree {
+    public override string Name { get { return "Vector Data Test - III [column-constrained]: Y = (X1 + sum[2:](V1)) * mean[:-2](V2 + X2)"; } }
 
-  //  public VectorDataTestTwoC() : base() { }
-  //  public VectorDataTestTwoC(int seed) : base(seed) { }
+    public VectorDataTestThreeC() : base() { }
+    public VectorDataTestThreeC(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 6 and 10; each feature is same length
+      // force two different lengths
+      int v1Length = rand.Next(6, 10);
+      int v2Length;
+      do {
+        v2Length = rand.Next(6, 10);
+      } while (v1Length != v2Length);
+      return new List<int>[2] {
+        Enumerable.Repeat(v1Length, Rows).ToList(),
+        Enumerable.Repeat(v2Length, Rows).ToList()
+      };
+    }
+  }
 
-  //public class VectorDataTestTwoD : VectorDataTestTwo {
-  //  public override string Name { get { return "Vector Data Test - II [unconstrained]: Y = X1 * mean(exp(V1) + X2 * V2)"; } }
+  public class VectorDataTestThreeD : VectorDataTestThree {
+    public override string Name { get { return "Vector Data Test - III [unconstrained]: Y = (X1 + sum[2:](V1)) * mean[:-2](V2 + X2)"; } }
 
-  //  public VectorDataTestTwoD() : base() { }
-  //  public VectorDataTestTwoD(int seed) : base(seed) { }
+    public VectorDataTestThreeD() : base() { }
+    public VectorDataTestThreeD(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 6 and 10
+      return new List<int>[2] {
+          Enumerable.Range(0, Rows).Select(i => rand.Next(6, 10)).ToList(),
+          Enumerable.Range(0, Rows).Select(i => rand.Next(6, 10)).ToList()
+        };
+    }
+  }
 }