- Timestamp:
- 11/12/12 09:26:00 (12 years ago)
- 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 23 23 using System; 24 24 namespace HeuristicLab.Problems.Instances.DataAnalysis { 25 public class Iris : I DataDescriptor {25 public class Iris : IUCIDataDescriptor { 26 26 public string Name { get { return "Iris"; } } 27 27 public string Description { … … 38 38 } 39 39 } 40 public string Donor { get { return "M. Marshall"; } } 41 public int Year { get { return 1988; } } 40 42 } 41 43 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Mammography.cs
r7849 r8889 23 23 using System; 24 24 namespace HeuristicLab.Problems.Instances.DataAnalysis { 25 public class Mammography : I DataDescriptor {26 public string Name { get { return " mammography"; } }25 public class Mammography : IUCIDataDescriptor { 26 public string Name { get { return "Mammography"; } } 27 27 public string Description { 28 28 get { … … 46 46 } 47 47 } 48 public string Donor { get { return "M. Elter"; } } 49 public int Year { get { return 2007; } } 48 50 } 49 51 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Thyroid.cs
r8841 r8889 23 23 using System; 24 24 namespace HeuristicLab.Problems.Instances.DataAnalysis { 25 public class Thyroid : I DataDescriptor {25 public class Thyroid : IUCIDataDescriptor { 26 26 public string Name { get { return "Thyroid"; } } 27 27 public string Description { … … 39 39 } 40 40 } 41 public string Donor { get { return "S. Aeberhard"; } } 42 public int Year { get { return 1992; } } 41 43 } 42 44 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs
r8841 r8889 46 46 47 47 public override IEnumerable<IDataDescriptor> GetDataDescriptors() { 48 List<I DataDescriptor> descriptorList = new List<IDataDescriptor>();48 List<IUCIDataDescriptor> descriptorList = new List<IUCIDataDescriptor>(); 49 49 descriptorList.Add(new Iris()); 50 50 descriptorList.Add(new Mammography()); … … 61 61 foreach (var entry in entries.OrderBy(x => x)) { 62 62 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); 64 65 if (desc != null) { 65 66 yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry); -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Wine.cs
r8595 r8889 23 23 using System; 24 24 namespace HeuristicLab.Problems.Instances.DataAnalysis { 25 public class Wine : I DataDescriptor {25 public class Wine : IUCIDataDescriptor { 26 26 public string Name { get { return "Wine"; } } 27 27 public string Description { … … 51 51 } 52 52 } 53 public string Donor { get { return "S. Aeberhard"; } } 54 public int Year { get { return 1991; } } 53 55 } 54 56 } -
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj
r8885 r8889 121 121 <Compile Include="Classification\ResourceClassificationInstanceProvider.cs" /> 122 122 <Compile Include="Classification\UCI\Iris.cs" /> 123 <Compile Include="Classification\UCI\IUCIDataDescriptor.cs" /> 123 124 <Compile Include="Classification\UCI\Mammography.cs" /> 124 125 <Compile Include="Classification\UCI\Thyroid.cs" />
Note: See TracChangeset
for help on using the changeset viewer.