Changeset 7805 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Classification

Timestamp:

05/14/12 15:21:28 (13 years ago)

Author:

sforsten

Message:

#1784: changes have been applied, according to the review comments of mkommend

Location:

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

Files:

• ArtificialClassificationDataDescriptor.cs (modified) (1 diff)
• ArtificialClassificationInstanceProvider.cs (modified) (1 diff)
• ClassificationInstanceProvider.cs (modified) (5 diffs)
• RealWorld/RealWorldInstanceProvider.cs (modified) (1 diff)
• ResourceClassificationInstanceProvider.cs (modified) (3 diffs)

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

@@ -36 +36 @@
     protected abstract int TestPartitionEnd { get; }
 
-    public ClassificationProblemData GenerateClassificationData() {
+    public IClassificationProblemData GenerateClassificationData() {
       Dataset dataset = new Dataset(InputVariables, this.GenerateValues());
 

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

@@ -24 +24 @@
 namespace HeuristicLab.Problems.Instances.Classification {
   public abstract class ArtificialClassificationInstanceProvider : ClassificationInstanceProvider {
-    public override ClassificationProblemData LoadData(IDataDescriptor descriptor) {
+    public override IClassificationProblemData LoadData(IDataDescriptor descriptor) {
       return ((ArtificialClassificationDataDescriptor)descriptor).GenerateClassificationData();
     }

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

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -29 +30 @@
 
 namespace HeuristicLab.Problems.Instances.Classification {
-  public abstract class ClassificationInstanceProvider : IProblemInstanceProvider<ClassificationProblemData> {
-    public ClassificationProblemData LoadData(string path) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(path);
+  public abstract class ClassificationInstanceProvider : IProblemInstanceProvider<IClassificationProblemData> {
+    public IClassificationProblemData LoadData(string path) {
+      NumberFormatInfo numberFormat;
+      DateTimeFormatInfo dateFormat;
+      char separator;
+      TableFileParser.DetermineFileFormat(new FileStream(path, FileMode.Open), out numberFormat, out dateFormat, out separator);
 
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      string targetVar = csvFileParser.VariableNames.Last();
-      IEnumerable<string> allowedInputVars = csvFileParser.VariableNames.Where(x => !x.Equals(targetVar));
-
-      ClassificationProblemData claData = new ClassificationProblemData(dataset, allowedInputVars, targetVar);
+      IClassificationProblemData claData = LoadData(new FileStream(path, FileMode.Open), numberFormat, dateFormat, separator);
       int pos = path.LastIndexOf('\\');
       if (pos < 0)
@@ -46 +45 @@
         claData.Name = path.Substring(pos, path.Length - pos);
       }
+
+      return claData;
+    }
+
+    protected IClassificationProblemData LoadData(Stream stream, NumberFormatInfo numberFormat, DateTimeFormatInfo dateFormat, char separator) {
+      TableFileParser csvFileParser = new TableFileParser();
+
+      csvFileParser.Parse(stream, numberFormat, dateFormat, separator);
+
+      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
+      string targetVar = csvFileParser.VariableNames.Last();
+      IEnumerable<string> allowedInputVars = csvFileParser.VariableNames.Where(x => !x.Equals(targetVar));
+
+      ClassificationProblemData claData = new ClassificationProblemData(dataset, allowedInputVars, targetVar);
 
       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
@@ -55 +68 @@
     }
 
-    public void SaveData(ClassificationProblemData instance, string path) {
+    public void SaveData(IClassificationProblemData instance, string path) {
       StringBuilder strBuilder = new StringBuilder();
 
@@ -80 +93 @@
 
     public abstract IEnumerable<IDataDescriptor> GetDataDescriptors();
-    public abstract ClassificationProblemData LoadData(IDataDescriptor descriptor);
+    public abstract IClassificationProblemData LoadData(IDataDescriptor descriptor);
 
     public abstract string Name { get; }

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

@@ -52 +52 @@
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
         using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
-          foreach (var entry in GetZipContents(solutionsZipFile).OrderBy(x => x)) {
+          IList<string> entries = new List<string>();
+          ZipEntry curEntry;
+          while ((curEntry = solutionsZipFile.GetNextEntry()) != null) {
+            entries.Add(curEntry.Name);
+          }
+          foreach (var entry in entries.OrderBy(x => x)) {
             string prettyName = Path.GetFileNameWithoutExtension(entry);
             IDataDescriptor desc = descriptorList.Where(x => x.Name.Equals(prettyName)).FirstOrDefault();

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -38 +39 @@
       if (!String.IsNullOrEmpty(solutionsArchiveName)) {
         using (var solutionsZipFile = new ZipInputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {
-          foreach (var entry in GetZipContents(solutionsZipFile).OrderBy(x => x))
+          IList<string> entries = new List<string>();
+          ZipEntry curEntry;
+          while ((curEntry = solutionsZipFile.GetNextEntry()) != null) {
+            entries.Add(curEntry.Name);
+          }
+          foreach (var entry in entries.OrderBy(x => x)) {
             yield return new ResourceClassificationDataDescriptor(Path.GetFileNameWithoutExtension(entry), Description, entry);
+          }
         }
       }
     }
 
-    public override ClassificationProblemData LoadData(IDataDescriptor id) {
+    public override IClassificationProblemData LoadData(IDataDescriptor id) {
       var descriptor = (ResourceClassificationDataDescriptor)id;
 
-      ClassificationProblemData claData = LoadData(GetTempFileForResource(descriptor.ResourceName));
-      claData.Name = descriptor.Name;
-      claData.Description = descriptor.Description;
+      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
+      using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
+        var entry = instancesZipFile.GetEntry(descriptor.ResourceName);
+        NumberFormatInfo numberFormat;
+        DateTimeFormatInfo dateFormat;
+        char separator;
+        using (Stream stream = instancesZipFile.GetInputStream(entry)) {
+          TableFileParser.DetermineFileFormat(stream, out numberFormat, out dateFormat, out separator);
+        }
 
-      return claData;
+        IClassificationProblemData claData;
+        using (Stream stream = instancesZipFile.GetInputStream(entry)) {
+          claData = LoadData(stream, numberFormat, dateFormat, separator);
+        }
+        claData.Name = descriptor.Name;
+        claData.Description = descriptor.Description;
+        return claData;
+      }
     }
 
@@ -58 +78 @@
               .Where(x => Regex.Match(x, @".*\.Data\." + fileName).Success).SingleOrDefault();
     }
-
-    protected IEnumerable<string> GetZipContents(ZipInputStream zipFile) {
-      ZipEntry entry;
-      while ((entry = zipFile.GetNextEntry()) != null) {
-        yield return entry.Name;
-      }
-    }
-
-    private string GetTempFileForResource(string resourceName) {
-      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
-      using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
-        var entry = instancesZipFile.GetEntry(resourceName);
-        string path = Path.GetTempFileName();
-        using (var stream = instancesZipFile.GetInputStream(entry)) {
-          WriteStreamToTempFile(stream, path);
-        }
-        return path;
-      }
-    }
-
-    private void WriteStreamToTempFile(Stream stream, string path) {
-      using (FileStream output = new FileStream(path, FileMode.Create, FileAccess.Write)) {
-        int cnt = 0;
-        byte[] buffer = new byte[32 * 1024];
-        while ((cnt = stream.Read(buffer, 0, buffer.Length)) != 0)
-          output.Write(buffer, 0, cnt);
-      }
-    }
   }
 }