Changeset 14791 for trunk

Timestamp:

03/30/17 12:35:37 (8 years ago)

Author:

gkronber

Message:

#2757: fixed training / test partitions and allowed input variables

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.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/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)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

@@ -463 +463 @@
     }
 
+  public bool StatisticsVisible {
+    get { return splitContainer.Panel2Collapsed; }
+    set { splitContainer.Panel2Collapsed = value; }
+  }
+  
     public void SetXAxis(string axisName) {
       xAxisComboBox.SelectedItem = axisName;

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        /*"Source1", "Source2",*/ "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
-        "x17", "x18", "x19", "x20", "x21", "x22" }; }
+        "x17", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 441; } }
+    protected override int TestPartitionStart { get { return 441; } }
+    protected override int TestPartitionEnd { get { return 657; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
-        "x17", "x18", "x19", "x20", "x21", "x22" }; }
+        "x17", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 437; } }
+    protected override int TestPartitionStart { get { return 437; } }
+    protected override int TestPartitionEnd { get { return 649; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
-        "x17", "x18", "x19", "x20", "x21", "x22" }; }
+        "x17", "x18", "x19", "x21", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 2636; } }
+    protected override int TestPartitionStart { get { return 2636; } }
+    protected override int TestPartitionEnd { get { return 3943; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
-        "x17", "x18", "x19", "x20", "x21", "x22" }; }
+        "x17", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 440; } }
+    protected override int TestPartitionStart { get { return 440; } }
+    protected override int TestPartitionEnd { get { return 656; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
-        "x17", "x18", "x19", "x20", "x21", "x22" }; }
+        "x17", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 437; } }
+    protected override int TestPartitionStart { get { return 437; } }
+    protected override int TestPartitionEnd { get { return 648; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
         "x17", "x18", "x19", "x20", "x21", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 641; } }
+    protected override int TestPartitionStart { get { return 641; } }
+    protected override int TestPartitionEnd { get { return 904; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

@@ -41 +41 @@
     protected override string[] AllowedInputVariables {
       get { return new string[] { /* "Material_Cat", */
-        "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
+        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
         /* "Material", "Grooving", "Oil", */                                           
         "x17", "x18", "x19", "x20", "x21", "x22" }; }
     }
     protected override int TrainingPartitionStart { get { return 0; } }
-    protected override int TrainingPartitionEnd { get { return 9999; } }
-    protected override int TestPartitionStart { get { return 9999; } }
-    protected override int TestPartitionEnd { get { return 9999; } }
+    protected override int TrainingPartitionEnd { get { return 640; } }
+    protected override int TestPartitionStart { get { return 640; } }
+    protected override int TestPartitionEnd { get { return 902; } }
   }
 }