Changeset 7667 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression

Timestamp:

03/27/12 16:58:22 (13 years ago)

Author:

sforsten

Message:

#1784:

• updated the Plugin.cs.frame files
• added other real world problem instances
• put some methods from TrentMcConaghyInstanceProvider to the super class ResourceRegressionInstanceProvider

Location:

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

Files:

• Data/RealWorld.zip (added)
• HeuristicLab.Problems.Instances.Regression-3.4.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)
• RealWorld (added)
• RealWorld/RealWorldInstanceProvider.cs (added)
• ResourceRegressionInstanceProvider.cs (modified) (3 diffs)
• TrentMcConaghy/TrentMcConaghyInstanceProvider.cs (modified) (3 diffs)

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

@@ -101 +101 @@
     <Compile Include="Nguyen\NguyenInstanceProvider.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="RealWorld\RealWorldInstanceProvider.cs" />
     <Compile Include="ResourceRegressionInstanceProvider.cs" />
     <Compile Include="ArtificialRegressionInstanceProvider.cs" />
@@ -126 +127 @@
   <ItemGroup>
     <EmbeddedResource Include="Data\TrentMcConaghy.zip" />
+    <EmbeddedResource Include="Data\RealWorld.zip" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Plugin.cs.frame

@@ -26 +26 @@
   [PluginFile("HeuristicLab.Problems.Instances.Regression-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs

@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.0.7665")]
+[assembly: AssemblyFileVersion("3.4.0.7666")]

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -30 +32 @@
 
     protected abstract string FileExtension { get; }
+
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
+      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))
+            yield return new ResourceRegressionDataDescriptor(Path.GetFileNameWithoutExtension(entry), Description, entry);
+        }
+      }
+    }
 
     public override RegressionData LoadData(IDataDescriptor id) {
@@ -44 +56 @@
       return Assembly.GetExecutingAssembly().GetManifestResourceNames()
               .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;
+      }
     }
 

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

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using ICSharpCode.SharpZipLib.Zip;
 
 namespace HeuristicLab.Problems.Instances.Regression {
@@ -48 +45 @@
     protected override string FileExtension { get { return "TrentMcConaghy"; } }
 
-    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      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))
-            yield return new ResourceRegressionDataDescriptor(Path.GetFileNameWithoutExtension(entry), Description, entry);
-        }
-      }
-    }
-
     public override RegressionData LoadData(IDataDescriptor id) {
       RegressionData regData = base.LoadData(id);
@@ -66 +53 @@
       return regData;
     }
-
-    protected IEnumerable<string> GetZipContents(ZipInputStream zipFile) {
-      ZipEntry entry;
-      while ((entry = zipFile.GetNextEntry()) != null) {
-        yield return entry.Name;
-      }
-    }
   }
 }