Changeset 8903 for trunk/sources

Timestamp:

11/13/12 09:54:54 (12 years ago)

Author:

sforsten

Message:

#1941:

• added two additional classification instances as suggested by abeham
• fixed a bug in UCIInstanceProvider

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• Classification/Data/UCI.zip (modified) (previous)
• Classification/UCI/Parkinson.cs (added)
• Classification/UCI/UCIInstanceProvider.cs (modified) (2 diffs)
• Classification/UCI/Vertebral_3C.cs (added)
• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (1 diff)

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

@@ -49 +49 @@
       descriptorList.Add(new Iris());
       descriptorList.Add(new Mammography());
+      descriptorList.Add(new Parkinson());
       descriptorList.Add(new Thyroid());
+      descriptorList.Add(new Vertebral_3C());
       descriptorList.Add(new Wine());
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
@@ -62 +64 @@
             string prettyName = Path.GetFileNameWithoutExtension(entry);
             IUCIDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
-            prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
             if (desc != null) {
+              prettyName = String.Format("{0}, {1}, {2}", prettyName, desc.Donor, desc.Year);
               yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);
             } else

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj

@@ -120 +120 @@
     <Compile Include="Classification\ResourceClassificationDataDescriptor.cs" />
     <Compile Include="Classification\ResourceClassificationInstanceProvider.cs" />
+    <Compile Include="Classification\UCI\Vertebral_3C.cs" />
+    <Compile Include="Classification\UCI\Parkinson.cs" />
     <Compile Include="Classification\UCI\Iris.cs" />
     <Compile Include="Classification\UCI\IUCIDataDescriptor.cs" />