Context Navigation

Changeset 7667

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

Files:

r7558	r7667
39	39	[PluginDependency("HeuristicLab.Optimization", "3.3")]
40	40	[PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
	41	[PluginDependency("HeuristicLab.Problems.Instances.Views", "3.4")]
41	42	[PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")]
42	43	public class HeuristicLabOptimizationViewsPlugin : PluginBase {

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

r7603	r7667
26	26	[PluginFile("HeuristicLab.Problems.Instances.Regression-3.4.dll", PluginFileType.Assembly)]
27	27	[PluginDependency("HeuristicLab.Common", "3.3")]
	28	[PluginDependency("HeuristicLab.Core", "3.3")]
	29	[PluginDependency("HeuristicLab.Optimization", "3.3")]
28	30	[PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
29	31	[PluginDependency("HeuristicLab.Problems.Instances", "3.3")]

r7666	r7667
55	55	// [assembly: AssemblyVersion("1.0.*")]
56	56	[assembly: AssemblyVersion("3.4.0.0")]
57		[assembly: AssemblyFileVersion("3.4.0.7665")]
	57	[assembly: AssemblyFileVersion("3.4.0.7666")]

-                      r7666
+                      r7667
 #endregion
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 …
     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) {
 …
       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;
+      }
+    }

-                      r7666
+                      r7667
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using ICSharpCode.SharpZipLib.Zip;
 namespace HeuristicLab.Problems.Instances.Regression {
 …
     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);
 …
       return regData;
+    }
-    protected IEnumerable<string> GetZipContents(ZipInputStream zipFile) {
-      ZipEntry entry;
-      while ((entry = zipFile.GetNextEntry()) != null) {
-        yield return entry.Name;
+      }
+    }
+  }
+}

r7666	r7667
23	23
24	24	namespace HeuristicLab.Problems.Instances.Views {
25		[Plugin("HeuristicLab.Problems.Instances.Views", "3.4.0.7665")]
	25	[Plugin("HeuristicLab.Problems.Instances.Views", "3.4.0.7666")]
26	26	[PluginFile("HeuristicLab.Problems.Instances.Views-3.4.dll", PluginFileType.Assembly)]
27	27	[PluginDependency("HeuristicLab.Common", "3.3")]

r7666	r7667
53	53	// by using the '*' as shown below:
54	54	[assembly: AssemblyVersion("3.4.0.0")]
55		[assembly: AssemblyFileVersion("3.4.2.7665")]
	55	[assembly: AssemblyFileVersion("3.4.2.7666")]

Note: See TracChangeset for help on using the changeset viewer.