Changeset 7666 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

Timestamp:

03/27/12 16:13:25 (13 years ago)

Author:

sforsten

Message:

#1784:

• deleted obsolete project Problems.Instances.Regression.Views
• added TrentMcConaghy and Various problem instances (zip file from TrentMcConaghy is rather big)

Location:

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

Files:

• . (modified) (1 prop)
• ResourceRegressionInstanceProvider.cs (modified) (3 diffs)

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

@@ -2 +2 @@
 bin
 obj
+*.user

@@ -2 +2 @@
 bin
 obj
+*.user

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

@@ -23 +23 @@
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
+using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.Instances.Regression {
   public abstract class ResourceRegressionInstanceProvider : RegressionInstanceProvider {
+
+    protected abstract string FileExtension { get; }
+
     public override RegressionData LoadData(IDataDescriptor id) {
       var descriptor = (ResourceRegressionDataDescriptor)id;
 
-      RegressionData regData = LoadData(GetTempFileForResource(descriptor.resourceName));
+      RegressionData regData = LoadData(GetTempFileForResource(descriptor.ResourceName));
       regData.Name = descriptor.Name;
       regData.Description = descriptor.Description;
@@ -36 +41 @@
     }
 
-    #region Helpers
-    protected static string GetTempFileForResource(string resourceName) {
-      Assembly assembly = Assembly.GetExecutingAssembly();
-      string resource = assembly.GetManifestResourceNames().Where(x => x.EndsWith(resourceName)).First();
-
-      string path = Path.GetTempFileName();
-
-      using (Stream stream = assembly.GetManifestResourceStream(resource)) {
-        WriteStreamToTempFile(stream, path);
-      }
-      return path;
+    protected virtual string GetResourceName(string fileName) {
+      return Assembly.GetExecutingAssembly().GetManifestResourceNames()
+              .Where(x => Regex.Match(x, @".*\.Data\." + fileName).Success).SingleOrDefault();
     }
 
-    private static void WriteStreamToTempFile(Stream stream, string path) {
+    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;
@@ -57 +66 @@
       }
     }
-    #endregion
   }
 }

@@ -2 +2 @@
 bin
 obj
+*.user