Changeset 7685

Timestamp:

04/02/12 16:36:29 (13 years ago)

Author:

sforsten

Message:

#1784:

• changed namespace of files in Problem.Instances.Classification
• added description to iris and mammography problem instances

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4

Files:

• ArtificialClassificationDataDescriptor.cs (modified) (1 diff)
• ArtificialClassificationInstanceProvider.cs (modified) (1 diff)
• ClassificationInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Classification-3.4.csproj (modified) (1 diff)
• RealWorld/Iris.cs (added)
• RealWorld/Mammography.cs (added)
• RealWorld/RealWorldInstanceProvider.cs (modified) (2 diffs)
• ResourceClassificationDataDescriptor.cs (modified) (1 diff)
• ResourceClassificationInstanceProvider.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ArtificialClassificationDataDescriptor.cs

@@ -22 +22 @@
 
 using System.Collections.Generic;
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ArtificialClassificationDataDescriptor : IDataDescriptor {
     public abstract string Name { get; }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ArtificialClassificationInstanceProvider.cs

@@ -21 +21 @@
 
 
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ArtificialClassificationInstanceProvider : ClassificationInstanceProvider {
     public override ClassificationData LoadData(IDataDescriptor descriptor) {

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ClassificationInstanceProvider.cs

@@ -27 +27 @@
 using System.Text;
 
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ClassificationInstanceProvider : IProblemInstanceProvider<ClassificationData> {
     public ClassificationData LoadData(string path) {

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/HeuristicLab.Problems.Instances.Classification-3.4.csproj

@@ -57 +57 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ClassificationInstanceProvider.cs" />
+    <Compile Include="RealWorld\Iris.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="RealWorld\Mammography.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="RealWorld\RealWorldInstanceProvider.cs" />
     <Compile Include="ResourceClassificationDataDescriptor.cs" />

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/RealWorld/RealWorldInstanceProvider.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using ICSharpCode.SharpZipLib.Zip;
 
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   public class RealWorldInstanceProvider : ResourceClassificationInstanceProvider {
     public override string Name {
@@ -40 +44 @@
 
     protected override string FileExtension { get { return "RealWorld"; } }
+
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
+      List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
+      descriptorList.Add(new Iris());
+      descriptorList.Add(new Mammography());
+      var solutionsArchiveName = GetResourceName(FileExtension + @"\.zip");
+      if (!String.IsNullOrEmpty(solutionsArchiveName)) {
+        using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
+          foreach (var entry in GetZipContents(solutionsZipFile).OrderBy(x => x)) {
+            string prettyName = Path.GetFileNameWithoutExtension(entry);
+            IDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();
+            if (desc != null) {
+              yield return new ResourceClassificationDataDescriptor(prettyName, desc.Description, entry);
+            } else
+              yield return new ResourceClassificationDataDescriptor(prettyName, Description, entry);
+          }
+        }
+      }
+    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ResourceClassificationDataDescriptor.cs

@@ -21 +21 @@
 
 
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   internal class ResourceClassificationDataDescriptor : IDataDescriptor {
     public string Name { get; internal set; }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification/3.4/ResourceClassificationInstanceProvider.cs

@@ -28 +28 @@
 using ICSharpCode.SharpZipLib.Zip;
 
-namespace HeuristicLab.Problems.Instances.Regression {
+namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ResourceClassificationInstanceProvider : ClassificationInstanceProvider {