Changeset 8595 for trunk

Timestamp:

09/07/12 11:29:30 (12 years ago)

Author:

sforsten

Message:

#1941:

• renamed real world classification to UCI
• added wine classification problem
• deleted Iris class, which has been forgotten in r8254

Location:

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

Files:

• Classification/Data/UCI.zip (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/Data/ClassificationRealWorld.zip)
• Classification/UCI (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/RealWorld)
• Classification/UCI/ClassificationRealWorldInstanceProvider.cs (deleted)
• Classification/UCI/Iris.cs (deleted)
• Classification/UCI/UCIInstanceProvider.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/RealWorld/ClassificationRealWorldInstanceProvider.cs) (3 diffs)
• Classification/UCI/Wine.cs (added)
• HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj (modified) (2 diffs)

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
-  public class ClassificationRealWorldInstanceProvider : ResourceClassificationInstanceProvider {
+  public class UCIInstanceProvider : ResourceClassificationInstanceProvider {
     public override string Name {
-      get { return "Real World Benchmark Problems"; }
+      get { return "UCI Problems"; }
     }
     public override string Description {
@@ -37 +37 @@
     }
     public override Uri WebLink {
-      get { return null; }
+      get { return new Uri("http://archive.ics.uci.edu/ml/datasets.html"); }
     }
     public override string ReferencePublication {
@@ -43 +43 @@
     }
 
-    protected override string FileName { get { return "ClassificationRealWorld"; } }
+    protected override string FileName { get { return "UCI"; } }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
       descriptorList.Add(new Mammography());
+      descriptorList.Add(new Wine());
       var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {

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

@@ -116 +116 @@
     <Compile Include="Classification\ClassificationInstanceProvider.cs" />
     <Compile Include="Classification\CSV\ClassifiactionCSVInstanceProvider.cs" />
-    <Compile Include="Classification\RealWorld\Iris.cs" />
-    <Compile Include="Classification\RealWorld\Mammography.cs" />
-    <Compile Include="Classification\RealWorld\ClassificationRealWorldInstanceProvider.cs" />
     <Compile Include="Classification\ResourceClassificationDataDescriptor.cs" />
     <Compile Include="Classification\ResourceClassificationInstanceProvider.cs" />
+    <Compile Include="Classification\UCI\Mammography.cs" />
+    <Compile Include="Classification\UCI\UCIInstanceProvider.cs" />
+    <Compile Include="Classification\UCI\Wine.cs" />
     <Compile Include="Clustering\ClusteringInstanceProvider.cs" />
     <Compile Include="Clustering\CSV\ClusteringCSVInstanceProvider.cs" />
@@ -196 +196 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Classification\Data\ClassificationRealWorld.zip" />
+    <EmbeddedResource Include="Classification\Data\UCI.zip" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />