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

Timestamp:

02/06/13 12:30:13 (12 years ago)

Author:

sforsten

Message:

#1941:

• added wisconsin breast cancer problem instance
• corrected iris dataset
• changed classification data descriptors to be able to set training and test partition as well as input and target variables (in the same way as it is done in regression)

File:

• trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/UCI/UCIInstanceProvider.cs (modified) (3 diffs)

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

@@ -46 +46 @@
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      List<IUCIDataDescriptor> descriptorList = new List<IUCIDataDescriptor>();
+      List<UCIDataDescriptor> descriptorList = new List<UCIDataDescriptor>();
       descriptorList.Add(new Iris());
       descriptorList.Add(new Mammography());
@@ -53 +53 @@
       descriptorList.Add(new Vertebral_3C());
       descriptorList.Add(new Wine());
+      descriptorList.Add(new WisconsinDiagnosticBreastCancer());
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
@@ -62 +63 @@
           }
           foreach (var entry in entries.OrderBy(x => x)) {
-            string prettyName = Path.GetFileNameWithoutExtension(entry);
-            IUCIDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            string filename = Path.GetFileNameWithoutExtension(entry);
+            UCIDataDescriptor desc = descriptorList.Where(x => x.Filename.Equals(filename)).FirstOrDefault();
             if (desc != null) {
-              prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
-              yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);
+              desc.ResourceName = entry;
+              yield return desc;
             } else
-              yield return new ResourceClassificationDataDescriptor(prettyName, Description, entry);
+              throw new ArgumentNullException("No Descriptor could be found for this entry.");
           }
         }