Changeset 16169


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

#2908 changed handling of resource names (moved into data descriptors)

Location:
trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression
Files:
16 edited

Legend:

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

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF1 : ResourceRegressionDataDescriptor {
    24     public CF1(string resourceName) : base(resourceName) { }
    25     public override string Name { get { return "CF1"; } }
     24    public CF1() : base("CF1.csv") { }
     25    public override string Name { get { return "CF1"; } }   
    2626    public override string Description {
    2727      get {
     
    3434    protected override string TargetVariable { get { return "Cf1"; } }
    3535    protected override string[] VariableNames {
    36       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"
    37  }; }
     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      }
    3840    }
    3941
    4042    protected override string[] AllowedInputVariables {
    41       get { return new string[] { "Material_Cat",
     43      get {
     44        return new string[] { "Material_Cat",
    4245        "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
    4346        "Material", "Grooving", "Oil",
    44         "x17", "x20", "x22" }; }
     47        "x17", "x20", "x22" };
     48      }
    4549    }
    4650    protected override int TrainingPartitionStart { get { return 0; } }
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF2.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF2 : ResourceRegressionDataDescriptor {
    24     public CF2(string resourceName) : base(resourceName) { }
     24    public CF2() : base("CF2.csv") { }
    2525    public override string Name { get { return "CF2"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF3.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF3 : ResourceRegressionDataDescriptor {
    24     public CF3(string resourceName) : base(resourceName) { }
     24    public CF3() : base("CF3.csv") { }
    2525    public override string Name { get { return "CF3"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/CF4.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class CF4 : ResourceRegressionDataDescriptor {
    24     public CF4(string resourceName) : base(resourceName) { }
     24    public CF4() : base("CF4.csv") { }
    2525    public override string Name { get { return "CF4"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/MibaFrictionRegressionInstanceProvider.cs

    r15855 r16169  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new CF1("CF1.csv"));
    50       descriptorList.Add(new CF2("CF2.csv"));
    51       descriptorList.Add(new CF3("CF3.csv"));
    52       descriptorList.Add(new CF4("CF4.csv"));
    53       descriptorList.Add(new NvhRating("NvhRating.csv"));
    54       descriptorList.Add(new Temp1("Temp1.csv"));
    55       descriptorList.Add(new Temp2("Temp2.csv"));
    56       descriptorList.Add(new Wear1("Wear1.csv"));
    57       descriptorList.Add(new Wear2("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;
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class NvhRating : ResourceRegressionDataDescriptor {
    24     public NvhRating(string resourceName) : base(resourceName) { }
     24    public NvhRating() : base("NvhRating.csv") { }
    2525    public override string Name { get { return "NvhRating"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp1.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Temp1 : ResourceRegressionDataDescriptor {
    24     public Temp1(string resourceName) : base(resourceName) { }
     24    public Temp1() : base("Temp1.csv") { }
    2525    public override string Name { get { return "Temp1"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Temp2.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Temp2 : ResourceRegressionDataDescriptor {
    24     public Temp2(string resourceName) : base(resourceName) { }
     24    public Temp2() : base("Temp2.csv") { }
    2525    public override string Name { get { return "Temp2"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear1.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Wear1 : ResourceRegressionDataDescriptor {
    24     public Wear1(string resourceName) : base(resourceName) { }
     24    public Wear1() : base("Wear1.csv") { }
    2525    public override string Name { get { return "Wear1"; } }
    2626    public override string Description {
     
    3333    }
    3434    protected override string TargetVariable { get { return "Wear1"; } }
     35
    3536    protected override string[] VariableNames {
    3637      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"
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/Wear2.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Wear2 : ResourceRegressionDataDescriptor {
    24     public Wear2(string resourceName) : base(resourceName) { }
     24    public Wear2() : base("Wear2.csv") { }
    2525    public override string Name { get { return "Wear2"; } }
    2626    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/ChemicalOne.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class ChemicalOne : ResourceRegressionDataDescriptor {
    24     public ChemicalOne(string resourceName) : base(resourceName) { }
     24    public ChemicalOne() : base("Chemical-I.csv") { }
    2525    public override string Name { get { return "Chemical-I"; } }
    2626    public override string Description { get { return ""; } }
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Housing.cs

    r15855 r16169  
    2222namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2323  public class Housing : ResourceRegressionDataDescriptor {
    24     public Housing(string resourceName) : base(resourceName) { }
     24    public Housing() : base("Housing.csv") { }
    2525    public override string Name { get { return "Housing"; } }
    2626    public override string Description { get { return ""; } }
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Powermeter.cs

    r15855 r16169  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class Powermeter : ResourceRegressionDataDescriptor {
    26     public Powermeter(string resourceName) : base(resourceName) { }
     26    public Powermeter() : base("Powermeter.txt") { }
    2727    public override string Name { get { return "Powermeter"; } }
    2828    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/RealWorldRegressionInstanceProvider.cs

    r15855 r16169  
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4848      List<ResourceRegressionDataDescriptor> descriptorList = new List<ResourceRegressionDataDescriptor>();
    49       descriptorList.Add(new ChemicalOne("Chemical-I.csv"));
    50       descriptorList.Add(new Housing("Housing.csv"));
    51       descriptorList.Add(new Tower("Tower.txt"));
    52       descriptorList.Add(new Powermeter("Powermeter.txt"));
    53       descriptorList.Add(new SARCOS("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    }
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/SARCOS.cs

    r15855 r16169  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class SARCOS : ResourceRegressionDataDescriptor {
    26     public SARCOS(string resourceName) : base(resourceName) { }
     26    public SARCOS() : base("SARCOS - Inverse Dynamics.txt") { }
    2727    public override string Name { get { return "SARCOS - Inverse Dynamics"; } }
    2828    public override string Description {
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/Tower.cs

    r15855 r16169  
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2525  public class Tower : ResourceRegressionDataDescriptor {
    26     public Tower(string resourceName) : base(resourceName) { }
     26    public Tower() : base("Tower.txt") { }
    2727    public override string Name { get { return "Tower"; } }
    2828    public override string Description {
Note: See TracChangeset for help on using the changeset viewer.