Changeset 15855


Ignore:
Timestamp:
03/22/18 14:45:27 (17 months ago)
Author:
fbaching
Message:

#2908: Change setter to private access level to prevent external changes of value; add constructor parameter for configuration of ResourceRegressionDataDescriptor
Add constructor to all existing instances.

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

Legend:

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

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

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

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

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

    r15583 r15855  
    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("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"));
    5858
    5959      return descriptorList;
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/MibaFriction/NvhRating.cs

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

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

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

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

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

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

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

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

    r15583 r15855  
    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("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"));
    5454      return descriptorList;
    5555    }
  • trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/RealWorld/SARCOS.cs

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

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

    r15853 r15855  
    2525namespace HeuristicLab.Problems.Instances.DataAnalysis {
    2626  public abstract class ResourceRegressionDataDescriptor : RegressionDataDescriptor {
    27     public 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) {
Note: See TracChangeset for help on using the changeset viewer.