Changeset 16170 for stable


Ignore:
Timestamp:
09/20/18 15:56:23 (11 months ago)
Author:
gkronber
Message:

#2908: merged r15853,r15855,r16169 from trunk to stable

Location:
stable
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Instances.DataAnalysis

  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF1.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF1 : ResourceRegressionDataDescriptor {
    24     public override string Name { get { return "CF1"; } }
     24    public CF1() : base("CF1.csv") { }
     25    public override string Name { get { return "CF1"; } }   
    2526    public override string Description {
    2627      get {
     
    3334    protected override string TargetVariable { get { return "Cf1"; } }
    3435    protected override string[] VariableNames {
    35       get { return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Cf1"
    36  }; }
     36      get {
     37        return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Cf1"
     38 };
     39      }
    3740    }
    3841
    3942    protected override string[] AllowedInputVariables {
    40       get { return new string[] { "Material_Cat",
     43      get {
     44        return new string[] { "Material_Cat",
    4145        "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    4246        "Material", "Grooving", "Oil",
    43         "x17", "x20", "x22" }; }
     47        "x17", "x20", "x22" };
     48      }
    4449    }
    4550    protected override int TrainingPartitionStart { get { return 0; } }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF2 : ResourceRegressionDataDescriptor {
     24    public CF2() : base("CF2.csv") { }
    2425    public override string Name { get { return "CF2"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF3 : ResourceRegressionDataDescriptor {
     24    public CF3() : base("CF3.csv") { }
    2425    public override string Name { get { return "CF3"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF4 : ResourceRegressionDataDescriptor {
     24    public CF4() : base("CF4.csv") { }
    2425    public override string Name { get { return "CF4"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs

    r15584 r16170  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new CF1() { ResourceName = "CF1.csv" });
    50       descriptorList.Add(new CF2() { ResourceName = "CF2.csv" });
    51       descriptorList.Add(new CF3() { ResourceName = "CF3.csv" });
    52       descriptorList.Add(new CF4() { ResourceName = "CF4.csv" });
    53       descriptorList.Add(new NvhRating() { ResourceName = "NvhRating.csv" });
    54       descriptorList.Add(new Temp1() { ResourceName = "Temp1.csv" });
    55       descriptorList.Add(new Temp2() { ResourceName = "Temp2.csv" });
    56       descriptorList.Add(new Wear1() { ResourceName = "Wear1.csv" });
    57       descriptorList.Add(new Wear2() { ResourceName = "Wear2.csv" });
     49      descriptorList.Add(new CF1());
     50      descriptorList.Add(new CF2());
     51      descriptorList.Add(new CF3());
     52      descriptorList.Add(new CF4());
     53      descriptorList.Add(new NvhRating());
     54      descriptorList.Add(new Temp1());
     55      descriptorList.Add(new Temp2());
     56      descriptorList.Add(new Wear1());
     57      descriptorList.Add(new Wear2());
    5858
    5959      return descriptorList;
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class NvhRating : ResourceRegressionDataDescriptor {
     24    public NvhRating() : base("NvhRating.csv") { }
    2425    public override string Name { get { return "NvhRating"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Temp1 : ResourceRegressionDataDescriptor {
     24    public Temp1() : base("Temp1.csv") { }
    2425    public override string Name { get { return "Temp1"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Temp2 : ResourceRegressionDataDescriptor {
     24    public Temp2() : base("Temp2.csv") { }
    2425    public override string Name { get { return "Temp2"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Wear1 : ResourceRegressionDataDescriptor {
     24    public Wear1() : base("Wear1.csv") { }
    2425    public override string Name { get { return "Wear1"; } }
    2526    public override string Description {
     
    3233    }
    3334    protected override string TargetVariable { get { return "Wear1"; } }
     35
    3436    protected override string[] VariableNames {
    3537      get { return new string[] { "Partition", "Source1", "Source2", "x1", "Material_Cat", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "Material", "Grooving", "Oil", "x17", "x18", "x19", "x20", "x21", "x22", "Wear1"
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Wear2 : ResourceRegressionDataDescriptor {
     24    public Wear2() : base("Wear2.csv") { }
    2425    public override string Name { get { return "Wear2"; } }
    2526    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/ChemicalOne.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class ChemicalOne : ResourceRegressionDataDescriptor {
     24    public ChemicalOne() : base("Chemical-I.csv") { }
    2425    public override string Name { get { return "Chemical-I"; } }
    2526    public override string Description { get { return ""; } }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Housing.cs

    r15584 r16170  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Housing : ResourceRegressionDataDescriptor {
     24    public Housing() : base("Housing.csv") { }
    2425    public override string Name { get { return "Housing"; } }
    2526    public override string Description { get { return ""; } }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Powermeter.cs

    r15584 r16170  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class Powermeter : ResourceRegressionDataDescriptor {
     26    public Powermeter() : base("Powermeter.txt") { }
    2627    public override string Name { get { return "Powermeter"; } }
    2728    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs

    r15584 r16170  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new ChemicalOne() { ResourceName = "Chemical-I.csv" });
    50       descriptorList.Add(new Housing() { ResourceName = "Housing.csv" });
    51       descriptorList.Add(new Tower() { ResourceName = "Tower.txt" });
    52       descriptorList.Add(new Powermeter() { ResourceName = "Powermeter.txt" });
    53       descriptorList.Add(new SARCOS() { ResourceName = "SARCOS - Inverse Dynamics.txt" });
     49      descriptorList.Add(new ChemicalOne());
     50      descriptorList.Add(new Housing());
     51      descriptorList.Add(new Tower());
     52      descriptorList.Add(new Powermeter());
     53      descriptorList.Add(new SARCOS());
    5454      return descriptorList;
    5555    }
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/SARCOS.cs

    r15584 r16170  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class SARCOS : ResourceRegressionDataDescriptor {
     26    public SARCOS() : base("SARCOS - Inverse Dynamics.txt") { }
    2627    public override string Name { get { return "SARCOS - Inverse Dynamics"; } }
    2728    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Tower.cs

    r15584 r16170  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class Tower : ResourceRegressionDataDescriptor {
     26    public Tower() : base("Tower.txt") { }
    2627    public override string Name { get { return "Tower"; } }
    2728    public override string Description {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionDataDescriptor.cs

    r15584 r16170  
    2525namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2626  public abstract class ResourceRegressionDataDescriptor : RegressionDataDescriptor {
    27     internal string ResourceName { get; set; }
     27    public ResourceRegressionDataDescriptor(string resourceName) {
     28      ResourceName = resourceName;
     29    }
     30
     31    public string ResourceName { get; private set; }
    2832
    2933    public bool CheckVariableNames(IEnumerable<string> VariableNames) {
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs

    r15584 r16170  
    6262
    6363    protected virtual string GetResourceName(string fileName) {
    64       return Assembly.GetExecutingAssembly().GetManifestResourceNames()
     64      return GetType().Assembly.GetManifestResourceNames()
    6565              .Where(x => Regex.Match(x, @".*\.Data\." + fileName).Success).SingleOrDefault();
    6666    }
Note: See TracChangeset for help on using the changeset viewer.