Changeset 8889 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification

Timestamp:

11/12/12 09:26:00 (12 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/Classification/UCI

Files:

• IUCIDataDescriptor.cs (added)
• Iris.cs (modified) (2 diffs)
• Mammography.cs (modified) (2 diffs)
• Thyroid.cs (modified) (2 diffs)
• UCIInstanceProvider.cs (modified) (2 diffs)
• Wine.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Iris.cs

@@ -23 +23 @@
 using System;
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class Iris : IDataDescriptor {
+  public class Iris : IUCIDataDescriptor {
     public string Name { get { return "Iris"; } }
     public string Description {
@@ -38 +38 @@
       }
     }
+    public string Donor { get { return "M. Marshall"; } }
+    public int Year { get { return 1988; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Mammography.cs

@@ -23 +23 @@
 using System;
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class Mammography : IDataDescriptor {
-    public string Name { get { return "mammography"; } }
+  public class Mammography : IUCIDataDescriptor {
+    public string Name { get { return "Mammography"; } }
     public string Description {
       get {
@@ -46 +46 @@
       }
     }
+    public string Donor { get { return "M. Elter"; } }
+    public int Year { get { return 2007; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Thyroid.cs

@@ -23 +23 @@
 using System;
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class Thyroid : IDataDescriptor {
+  public class Thyroid : IUCIDataDescriptor {
     public string Name { get { return "Thyroid"; } }
     public string Description {
@@ -39 +39 @@
       }
     }
+    public string Donor { get { return "S. Aeberhard"; } }
+    public int Year { get { return 1992; } }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs

@@ -46 +46 @@
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      List<IUCIDataDescriptor> descriptorList = new List<IUCIDataDescriptor>();
       descriptorList.Add(new Iris());
       descriptorList.Add(new Mammography());
@@ -61 +61 @@
           foreach (var entry in entries.OrderBy(x => x)) {
             string prettyName = Path.GetFileNameWithoutExtension(entry);
-            IDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            IUCIDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
             if (desc != null) {
               yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/Wine.cs

@@ -23 +23 @@
 using System;
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class Wine : IDataDescriptor {
+  public class Wine : IUCIDataDescriptor {
     public string Name { get { return "Wine"; } }
     public string Description {
@@ -51 +51 @@
       }
     }
+    public string Donor { get { return "S. Aeberhard"; } }
+    public int Year { get { return 1991; } }
   }
 }