Changeset 7805 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4

Timestamp:

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

Author:

sforsten

Message:

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

Location:

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

Files:

• ArtificialRegressionDataDescriptor.cs (modified) (1 diff)
• ArtificialRegressionInstanceProvider.cs (modified) (1 diff)
• RealWorld/RealWorldInstanceProvider.cs (modified) (1 diff)
• RegressionInstanceProvider.cs (modified) (5 diffs)
• ResourceRegressionInstanceProvider.cs (modified) (3 diffs)
• TrentMcConaghy/TrentMcConaghyInstanceProvider.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

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

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionInstanceProvider.cs

@@ -24 +24 @@
 namespace HeuristicLab.Problems.Instances.Regression {
   public abstract class ArtificialRegressionInstanceProvider : RegressionInstanceProvider {
-    public override RegressionProblemData LoadData(IDataDescriptor descriptor) {
+    public override IRegressionProblemData LoadData(IDataDescriptor descriptor) {
       return ((ArtificialRegressionDataDescriptor)descriptor).GenerateRegressionData();
     }

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

@@ -39 +39 @@
     }
 
-    protected override string FileExtension { get { return "RealWorld"; } }
+    protected override string FileName { get { return "RealWorld"; } }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/RegressionInstanceProvider.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.Regression {
-  public abstract class RegressionInstanceProvider : IProblemInstanceProvider<RegressionProblemData> {
-    public RegressionProblemData LoadData(string path) {
-      TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(path);
+  public abstract class RegressionInstanceProvider : IProblemInstanceProvider<IRegressionProblemData> {
 
-      Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
-      string targetVar = csvFileParser.VariableNames.Last();
-      IEnumerable<string> allowedInputVars = csvFileParser.VariableNames.Where(x => !x.Equals(targetVar));
+    public IRegressionProblemData LoadData(string path) {
+      NumberFormatInfo numberFormat;
+      DateTimeFormatInfo dateFormat;
+      char separator;
+      TableFileParser.DetermineFileFormat(path, out numberFormat, out dateFormat, out separator);
 
-      RegressionProblemData regData = new RegressionProblemData(dataset, allowedInputVars, targetVar);
+      IRegressionProblemData regData = LoadData(new FileStream(path, FileMode.Open), numberFormat, dateFormat, separator);
+
       int pos = path.LastIndexOf('\\');
       if (pos < 0)
@@ -46 +47 @@
         regData.Name = path.Substring(pos, path.Length - pos);
       }
+      return regData;
+    }
+
+    protected IRegressionProblemData 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));
+
+      RegressionProblemData regData = new RegressionProblemData(dataset, allowedInputVars, targetVar);
 
       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
@@ -52 +66 @@
       regData.TestPartition.Start = trainingPartEnd;
       regData.TestPartition.End = csvFileParser.Rows;
+
       return regData;
     }
 
-    public void SaveData(RegressionProblemData instance, string path) {
+    public void SaveData(IRegressionProblemData instance, string path) {
       StringBuilder strBuilder = new StringBuilder();
 
@@ -80 +95 @@
 
     public abstract IEnumerable<IDataDescriptor> GetDataDescriptors();
-    public abstract RegressionProblemData LoadData(IDataDescriptor descriptor);
+    public abstract IRegressionProblemData LoadData(IDataDescriptor descriptor);
 
     public abstract string Name { get; }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -32 +33 @@
   public abstract class ResourceRegressionInstanceProvider : RegressionInstanceProvider {
 
-    protected abstract string FileExtension { get; }
+    protected abstract string FileName { get; }
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var solutionsArchiveName = GetResourceName(FileExtension + @"\.zip");
+      var solutionsArchiveName = GetResourceName(FileName + @"\.zip");
       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 ResourceRegressionDataDescriptor(Path.GetFileNameWithoutExtension(entry), Description, entry);
+          }
         }
       }
     }
 
-    public override RegressionProblemData LoadData(IDataDescriptor id) {
+    public override IRegressionProblemData LoadData(IDataDescriptor id) {
       var descriptor = (ResourceRegressionDataDescriptor)id;
 
-      RegressionProblemData regData = LoadData(GetTempFileForResource(descriptor.ResourceName));
-      regData.Name = descriptor.Name;
-      regData.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 regData;
+        IRegressionProblemData regData;
+        using (Stream stream = instancesZipFile.GetInputStream(entry)) {
+          regData = LoadData(stream, numberFormat, dateFormat, separator);
+        }
+
+        regData.Name = descriptor.Name;
+        regData.Description = descriptor.Description;
+        return regData;
+      }
     }
 
@@ -58 +79 @@
               .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(FileExtension + @"\.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);
-      }
-    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/TrentMcConaghy/TrentMcConaghyInstanceProvider.cs

@@ -45 +45 @@
     }
 
-    protected override string FileExtension { get { return "TrentMcConaghy"; } }
+    protected override string FileName { get { return "TrentMcConaghy"; } }
 
-    public override RegressionProblemData LoadData(IDataDescriptor id) {
-      RegressionProblemData regData = base.LoadData(id);
+    public override IRegressionProblemData LoadData(IDataDescriptor id) {
+      IRegressionProblemData regData = base.LoadData(id);
       string targetVar = regData.InputVariables.First().Value;
       IEnumerable<string> allowedInputVars = regData.InputVariables.Where(x => !x.Equals(regData.TargetVariable)).Select(x => x.Value);