Changeset 7666

Timestamp:

03/27/12 16:13:25 (12 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

Files:

• HeuristicLab 3.3.sln (modified) (2 diffs)
• HeuristicLab.Problems.Instances.Regression.Views (deleted)
• HeuristicLab.Problems.Instances.Regression/3.4 (modified) (1 prop)
• HeuristicLab.Problems.Instances.Regression/3.4/Data (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Data/TrentMcConaghy.zip (added)
• HeuristicLab.Problems.Instances.Regression/3.4/HeuristicLab.Problems.Instances.Regression-3.4.csproj (modified) (4 diffs)
• HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionDataDescriptor.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.Regression/3.4/TrentMcConaghy (added)
• HeuristicLab.Problems.Instances.Regression/3.4/TrentMcConaghy/TrentMcConaghyInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Various (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Various/BreimanOne.cs (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Various/PolyTen.cs (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Various/SpatialCoevolution.cs (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Various/VariousInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/KotanchekFunction.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Views/3.4/Plugin.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Views/3.4/Properties/AssemblyInfo.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab 3.3.sln

@@ -15 +15 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Regression-3.4", "HeuristicLab.Problems.Instances.Regression\3.4\HeuristicLab.Problems.Instances.Regression-3.4.csproj", "{26BF13E1-C8B2-4ACE-862D-EBFD360116B3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Regression.Views-3.4", "HeuristicLab.Problems.Instances.Regression.Views\3.4\HeuristicLab.Problems.Instances.Regression.Views-3.4.csproj", "{1CC61973-7706-42DC-8023-310F591AB02B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Views-3.3", "HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj", "{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}"
@@ -94 +92 @@
     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x64.ActiveCfg = Release|Any CPU
     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x86.ActiveCfg = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x64.ActiveCfg = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x86.ActiveCfg = Debug|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.Build.0 = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x64.ActiveCfg = Release|Any CPU
-    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x86.ActiveCfg = Release|Any CPU
     {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU

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/HeuristicLab.Problems.Instances.Regression-3.4.csproj

@@ -53 +53 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -107 +108 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RegressionInstanceProvider.cs" />
+    <Compile Include="TrentMcConaghy\TrentMcConaghyInstanceProvider.cs" />
     <Compile Include="ValueGenerator.cs" />
+    <Compile Include="Various\BreimanOne.cs" />
+    <Compile Include="Various\SpatialCoevolution.cs" />
+    <Compile Include="Various\PolyTen.cs" />
+    <Compile Include="Various\VariousInstanceProvider.cs" />
     <Compile Include="Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
     <Compile Include="Vladislavleva\SineCosineFunction.cs" />
@@ -119 +125 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Data\TrentMcConaghy.zip" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
@@ -133 +140 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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.7664")]
+[assembly: AssemblyFileVersion("3.4.0.7665")]

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

@@ -26 +26 @@
     public string Description { get; internal set; }
 
-    internal string resourceName { get; set; }
+    internal string ResourceName { get; set; }
+    internal ResourceRegressionDataDescriptor(string name, string description, string resourceName) {
+      Name = name;
+      Description = description;
+      ResourceName = resourceName;
+    }
   }
 }

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
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/KotanchekFunction.cs

@@ -57 +57 @@
       }
 
-
       double x1, x2;
       List<double> results = new List<double>();

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/Plugin.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Instances.Views {
-  [Plugin("HeuristicLab.Problems.Instances.Views", "3.4.0.7664")]
+  [Plugin("HeuristicLab.Problems.Instances.Views", "3.4.0.7665")]
   [PluginFile("HeuristicLab.Problems.Instances.Views-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

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

@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.4.0.0")]
-[assembly: AssemblyFileVersion("3.4.2.7664")]
+[assembly: AssemblyFileVersion("3.4.2.7665")]

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