Changeset 14853


Ignore:
Timestamp:
04/12/17 10:19:05 (6 months ago)
Author:
gkronber
Message:

#2757: set factor variables as allowed for miba friction benchmark problems

Location:
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs

    r14789 r14853  
    3737    }
    3838
    39     // TODO: include string variables after factor branch integration
    4039    protected override string[] AllowedInputVariables {
    41       get { return new string[] { /* "Material_Cat", */
     40      get { return new string[] { "Material_Cat",
    4241        "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    43         /* "Material", "Grooving", "Oil", */                                           
     42        "Material", "Grooving", "Oil",
    4443        "x17", "x20", "x22" }; }
    4544    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

    r14790 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
    43         "Source1", "Source2", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     41      get { return new string[] { "Material_Cat",
     42        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
    43         /*"Source1", "Source2",*/ "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     41      get { return new string[] { "Material_Cat",
     42        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x21", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "x1", "x2", "x3", "x4", "x5", "x6", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

    r14791 r14853  
    3838    }
    3939
    40     // TODO: include string variables after factor branch integration
    4140    protected override string[] AllowedInputVariables {
    42       get { return new string[] { /* "Material_Cat", */
     41      get { return new string[] { "Material_Cat",
    4342        "Source1", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    44         /* "Material", "Grooving", "Oil", */                                           
     43        "Material", "Grooving", "Oil",
    4544        "x17", "x18", "x19", "x20", "x21", "x22" }; }
    4645    }
Note: See TracChangeset for help on using the changeset viewer.