Changeset 16141 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction

Timestamp:

09/14/18 11:47:37 (6 years ago)

Author:

abeham

Message:

#2817: updated to trunk r16140

Location:

branches/2817-BinPackingSpeedup

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class CF1 : ResourceRegressionDataDescriptor {
+    public CF1(string resourceName) : base(resourceName) { }
     public override string Name { get { return "CF1"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class CF2 : ResourceRegressionDataDescriptor {
+    public CF2(string resourceName) : base(resourceName) { }
     public override string Name { get { return "CF2"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class CF3 : ResourceRegressionDataDescriptor {
+    public CF3(string resourceName) : base(resourceName) { }
     public override string Name { get { return "CF3"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class CF4 : ResourceRegressionDataDescriptor {
+    public CF4(string resourceName) : base(resourceName) { }
     public override string Name { get { return "CF4"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs

@@ -47 +47 @@
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
-      descriptorList.Add(new CF1() { ResourceName = "CF1.csv" });
-      descriptorList.Add(new CF2() { ResourceName = "CF2.csv" });
-      descriptorList.Add(new CF3() { ResourceName = "CF3.csv" });
-      descriptorList.Add(new CF4() { ResourceName = "CF4.csv" });
-      descriptorList.Add(new NvhRating() { ResourceName = "NvhRating.csv" });
-      descriptorList.Add(new Temp1() { ResourceName = "Temp1.csv" });
-      descriptorList.Add(new Temp2() { ResourceName = "Temp2.csv" });
-      descriptorList.Add(new Wear1() { ResourceName = "Wear1.csv" });
-      descriptorList.Add(new Wear2() { ResourceName = "Wear2.csv" });
+      descriptorList.Add(new CF1("CF1.csv"));
+      descriptorList.Add(new CF2("CF2.csv"));
+      descriptorList.Add(new CF3("CF3.csv"));
+      descriptorList.Add(new CF4("CF4.csv"));
+      descriptorList.Add(new NvhRating("NvhRating.csv"));
+      descriptorList.Add(new Temp1("Temp1.csv"));
+      descriptorList.Add(new Temp2("Temp2.csv"));
+      descriptorList.Add(new Wear1("Wear1.csv"));
+      descriptorList.Add(new Wear2("Wear2.csv"));
 
       return descriptorList;

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class NvhRating : ResourceRegressionDataDescriptor {
+    public NvhRating(string resourceName) : base(resourceName) { }
     public override string Name { get { return "NvhRating"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class Temp1 : ResourceRegressionDataDescriptor {
+    public Temp1(string resourceName) : base(resourceName) { }
     public override string Name { get { return "Temp1"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class Temp2 : ResourceRegressionDataDescriptor {
+    public Temp2(string resourceName) : base(resourceName) { }
     public override string Name { get { return "Temp2"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class Wear1 : ResourceRegressionDataDescriptor {
+    public Wear1(string resourceName) : base(resourceName) { }
     public override string Name { get { return "Wear1"; } }
     public override string Description {

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public class Wear2 : ResourceRegressionDataDescriptor {
+    public Wear2(string resourceName) : base(resourceName) { }
     public override string Name { get { return "Wear2"; } }
     public override string Description {