Changeset 17915 for branches/3040_VectorBasedGP

Timestamp:

03/25/21 18:06:47 (4 years ago)

Author:

pfleck

Message:

#3040 started added some vector benchmarks for gptp.

Location:

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

Files:

• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (2 diffs)
• Regression/GPTP2021VectorBenchmarks (added)
• Regression/GPTP2021VectorBenchmarks/GPTP2021VectorBenchmarkDataDescriptor.cs (added)
• Regression/GPTP2021VectorBenchmarks/GPTP2021VectorBenchmarksInstanceProvider.cs (copied) (copied from branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs) (2 diffs)
• Regression/VectorData/VectorDataTestThree.cs (modified) (1 diff)
• Regression/VectorData/VectorDataTestTwo.cs (modified) (1 diff)

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

@@ -288 +288 @@
     <Compile Include="Regression\Feynman\FeynmanLargeInstanceProvider.cs" />
     <Compile Include="Regression\Feynman\FeynmanSmallInstanceProvider.cs" />
+    <Compile Include="Regression\GPTP2021VectorBenchmarks\GPTP2021VectorBenchmarkDataDescriptor.cs" />
+    <Compile Include="Regression\GPTP2021VectorBenchmarks\GPTP2021VectorBenchmarksInstanceProvider.cs" />
     <Compile Include="Regression\MibaFriction\CF3.cs" />
     <Compile Include="Regression\MibaFriction\Wear1.cs" />
@@ -418 +420 @@
     <EmbeddedResource Include="Regression\Data\MibaFriction.zip" />
     <EmbeddedResource Include="Regression\Data\PennML.zip" />
+    <EmbeddedResource Include="Regression\Data\GPTP2021VectorBenchmarks.zip" />
     <None Include="Regression\Data\UCITimeSeries.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

branches/3040_VectorBasedGP/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/GPTP2021VectorBenchmarks/GPTP2021VectorBenchmarksInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Runtime.Remoting.Messaging;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class RegressionRealWorldInstanceProvider : ResourceRegressionInstanceProvider {
+  public class GPTP2021VectorBenchmarksInstanceProvider : ResourceRegressionInstanceProvider {
     public override string Name {
-      get { return "Real World Benchmark Problems"; }
+      get { return "GPTP 2021 Vector Benchmark Problems"; }
     }
     public override string Description {
@@ -40 +43 @@
     }
 
-    protected override string FileName { get { return "RegressionRealWorld"; } }
+    protected override string FileName { get { return "GPTP2021VectorBenchmarks"; } }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
-      descriptorList.Add(new ChemicalOne());
-      descriptorList.Add(new Housing());
-      descriptorList.Add(new Tower());
-      descriptorList.Add(new Powermeter());
-      descriptorList.Add(new SARCOS());
-      return descriptorList;
+      return new List<ResourceRegressionDataDescriptor> {
+        new GPTP2021VectorBenchmarkDataDescriptor("test_A_01", new []{ "v1" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_A_02", new []{ "v1" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_A_03", new []{ "x1", "v1" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_A_04", new []{ "x1", "x2", "v1", "v2" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_A_05", new []{ "x1", "x2", "v1", "v2" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_B_01", new []{ "x1", "x2", "v1", "v2" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_B_02", new []{ "x1", "x2", "v1", "v2" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_B_03", new []{ "x1", "x2", "v1", "v2", "v3" }),
+        new GPTP2021VectorBenchmarkDataDescriptor("test_B_04", new []{ "x1", "x2", "v1", "v2", "v3", "v4" }),
+
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_A_01", Flatten(V("v1"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_A_02", Flatten(V("v1"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_A_03", Flatten(S("x1"), V("v1"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_A_04", Flatten(S("x1"), S("x2"), V("v1"), V("v2"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_A_05", Flatten(S("x1"), S("x2"), V("v1"), V("v2"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_B_01", Flatten(S("x1"), S("x2"), V("v1"), V("v2"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_B_02", Flatten(S("x1"), S("x2"), V("v1"), V("v2"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_B_03", Flatten(S("x1"), S("x2"), V("v1"), V("v2"), V("v3"))),
+        new GPTP2021VectorBenchmarkDataDescriptor("unrolled_test_B_04", Flatten(S("x1"), S("x2"), V("v1"), V("v2"), V("v3"), V("v4")))
+      };
+    }
+
+    private static IEnumerable<string> S(string name) {
+      yield return name;
+    }
+    // Unroll vector variable name
+    private static IEnumerable<string> V(string name, int length = 20) {
+      return Enumerable.Range(0, length).Select(i => name + "_" + i);
+    }
+    private static T[] Flatten<T>(params IEnumerable<T>[] values) {
+      return values.SelectMany(x => x).ToArray();
+    }
+
+    protected override TableFileFormatOptions GetFormatOptions(ZipArchiveEntry entry) {
+      return new TableFileFormatOptions() {
+        ColumnSeparator = ';',
+        VectorSeparator = ','
+      };
     }
   }

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

@@ -80 +80 @@
 
         //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();
+        y = (x1 + v1.SubVector(2, v1.Count - 2).Sum()) * (v2 + x2).SubVector(0, v2.Count - 2).Mean();
 
         x1Column.Add(x1);

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

@@ -78 +78 @@
         v2 = rand.NextDoubleVector(2, 4, v2Length);
 
-        y = x1 * v1.PointwiseExp().PointwiseMultiply(x2  - v2 - 2).Sum();
+        y = x1 * v1.PointwiseExp().PointwiseMultiply(x2 - v2 - 2).Sum();
 
         x1Column.Add(x1);