Changeset 15196 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

Timestamp:

07/11/17 12:58:52 (7 years ago)

Author:

gkronber

Message:

#2757: merged r14789,r14790,r14791,r14853,r15016 from trunk to stable

Location:

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction)
• Wear2.cs (modified) (1 diff)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

@@ -38 +38 @@
     }
 
-    // TODO: include string variables after factor branch integration
     protected override string[] AllowedInputVariables {
-      get { return new string[] { /* "Material_Cat", */
+      get { return new string[] { "Material_Cat", 
         "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
-        /* "Material", "Grooving", "Oil", */                                           
+        "Material", "Grooving", "Oil",
         "x17", "x18", "x19", "x20", "x21", "x22" }; }
     }