Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8889


Ignore:
Timestamp:
11/12/12 09:26:00 (10 years ago)
Author:
sforsten
Message:

#1941: IUCIDataDescriptor to add more information about the datasets to the data, to distinguish between different version, as suggested by abeham

Location:
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Iris.cs

    r8841 r8889  
    2323using System;
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    25   public class Iris : IDataDescriptor {
     25  public class Iris : IUCIDataDescriptor {
    2626    public string Name { get { return "Iris"; } }
    2727    public string Description {
     
    3838      }
    3939    }
     40    public string Donor { get { return "M. Marshall"; } }
     41    public int Year { get { return 1988; } }
    4042  }
    4143}
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Mammography.cs

    r7849 r8889  
    2323using System;
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    25   public class Mammography : IDataDescriptor {
    26     public string Name { get { return "mammography"; } }
     25  public class Mammography : IUCIDataDescriptor {
     26    public string Name { get { return "Mammography"; } }
    2727    public string Description {
    2828      get {
     
    4646      }
    4747    }
     48    public string Donor { get { return "M. Elter"; } }
     49    public int Year { get { return 2007; } }
    4850  }
    4951}
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Thyroid.cs

    r8841 r8889  
    2323using System;
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    25   public class Thyroid : IDataDescriptor {
     25  public class Thyroid : IUCIDataDescriptor {
    2626    public string Name { get { return "Thyroid"; } }
    2727    public string Description {
     
    3939      }
    4040    }
     41    public string Donor { get { return "S. Aeberhard"; } }
     42    public int Year { get { return 1992; } }
    4143  }
    4244}
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs

    r8841 r8889  
    4646
    4747    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    48       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
     48      List<IUCIDataDescriptor> descriptorList = new List<IUCIDataDescriptor>();
    4949      descriptorList.Add(new Iris());
    5050      descriptorList.Add(new Mammography());
     
    6161          foreach (var entry in entries.OrderBy(x => x)) {
    6262            string prettyName = Path.GetFileNameWithoutExtension(entry);
    63             IDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
     63            IUCIDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
     64            prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
    6465            if (desc != null) {
    6566              yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Wine.cs

    r8595 r8889  
    2323using System;
    2424namespace HeuristicLab.Problems.Instances.DataAnalysis {
    25   public class Wine : IDataDescriptor {
     25  public class Wine : IUCIDataDescriptor {
    2626    public string Name { get { return "Wine"; } }
    2727    public string Description {
     
    5151      }
    5252    }
     53    public string Donor { get { return "S. Aeberhard"; } }
     54    public int Year { get { return 1991; } }
    5355  }
    5456}
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

    r8885 r8889  
    121121    <Compile Include="Classification\ResourceClassificationInstanceProvider.cs" />
    122122    <Compile Include="Classification\UCI\Iris.cs" />
     123    <Compile Include="Classification\UCI\IUCIDataDescriptor.cs" />
    123124    <Compile Include="Classification\UCI\Mammography.cs" />
    124125    <Compile Include="Classification\UCI\Thyroid.cs" />
Note: See TracChangeset for help on using the changeset viewer.