- Timestamp:
- 12/10/14 10:31:41 (10 years ago)
- Location:
- branches/ALPS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ALPS
-
branches/ALPS/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj
r8624 r11677 11 11 <RootNamespace>HeuristicLab.Problems.Instances.TSPLIB</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.Instances.TSPLIB-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 <TargetFrameworkProfile /> 15 16 </PropertyGroup> 16 17 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 22 23 <ErrorReport>prompt</ErrorReport> 23 24 <WarningLevel>4</WarningLevel> 25 <Prefer32Bit>false</Prefer32Bit> 24 26 </PropertyGroup> 25 27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 30 32 <ErrorReport>prompt</ErrorReport> 31 33 <WarningLevel>4</WarningLevel> 34 <Prefer32Bit>false</Prefer32Bit> 32 35 </PropertyGroup> 33 36 <PropertyGroup> … … 52 55 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 53 56 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 57 <Prefer32Bit>false</Prefer32Bit> 54 58 </PropertyGroup> 55 59 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> … … 68 72 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 69 73 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 74 <Prefer32Bit>false</Prefer32Bit> 70 75 </PropertyGroup> 71 76 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> … … 84 89 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 85 90 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 91 <Prefer32Bit>false</Prefer32Bit> 86 92 </PropertyGroup> 87 93 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> … … 100 106 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 101 107 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 108 <Prefer32Bit>false</Prefer32Bit> 102 109 </PropertyGroup> 103 110 <ItemGroup> 104 <Reference Include="ICSharpCode.SharpZipLib">105 <HintPath>..\..\HeuristicLab.PluginInfrastructure\3.3\ICSharpCode.SharpZipLib.dll</HintPath>106 <Private>False</Private>107 </Reference>108 111 <Reference Include="System" /> 109 112 <Reference Include="System.Core" /> 110 113 <Reference Include="System.Data" /> 114 <Reference Include="System.IO.Compression" /> 111 115 </ItemGroup> 112 116 <ItemGroup> … … 149 153 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 150 154 <PropertyGroup> 151 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)155 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 152 156 set ProjectDir=$(ProjectDir) 153 157 set SolutionDir=$(SolutionDir) … … 155 159 156 160 call PreBuildEvent.cmd</PreBuildEvent> 157 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">161 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 158 162 export ProjectDir=$(ProjectDir) 159 163 export SolutionDir=$(SolutionDir) -
branches/ALPS/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs
r11171 r11677 23 23 using System.Collections.Generic; 24 24 using System.IO; 25 using System.IO.Compression; 25 26 using System.Linq; 26 27 using System.Reflection; 27 28 using System.Text.RegularExpressions; 28 using ICSharpCode.SharpZipLib.Zip;29 29 30 30 namespace HeuristicLab.Problems.Instances.TSPLIB { … … 52 52 var solutionsArchiveName = GetResourceName(FileExtension + @"\.opt\.tour\.zip"); 53 53 if (!String.IsNullOrEmpty(solutionsArchiveName)) { 54 using (var solutionsZipFile = new Zip InputStream(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {55 foreach (var entry in GetZipContents(solutionsZipFile))56 solutions.Add(entry. Substring(0, entry.Length - ".opt.tour".Length) + "." + FileExtension, entry);54 using (var solutionsZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName), ZipArchiveMode.Read)) { 55 foreach (var entry in solutionsZipFile.Entries) 56 solutions.Add(entry.Name.Substring(0, entry.Name.Length - ".opt.tour".Length) + "." + FileExtension, entry.Name); 57 57 } 58 58 } … … 60 60 if (String.IsNullOrEmpty(instanceArchiveName)) yield break; 61 61 62 using (var instanceStream = new Zip InputStream(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {63 foreach (var entry in GetZipContents(instanceStream).OrderBy(x => x)) {62 using (var instanceStream = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName), ZipArchiveMode.Read)) { 63 foreach (var entry in instanceStream.Entries.Select(x => x.Name).OrderBy(x => x)) { 64 64 yield return new TSPLIBDataDescriptor(Path.GetFileNameWithoutExtension(entry), GetInstanceDescription(), entry, solutions.ContainsKey(entry) ? solutions[entry] : String.Empty); 65 65 } … … 70 70 var descriptor = (TSPLIBDataDescriptor)id; 71 71 var instanceArchiveName = GetResourceName(FileExtension + @"\.zip"); 72 using (var instancesZipFile = new Zip File(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {72 using (var instancesZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(instanceArchiveName), ZipArchiveMode.Read)) { 73 73 var entry = instancesZipFile.GetEntry(descriptor.InstanceIdentifier); 74 var stream = instancesZipFile.GetInputStream(entry);74 var stream = entry.Open(); 75 75 var parser = new TSPLIBParser(stream); 76 76 var instance = LoadInstance(parser); … … 78 78 if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) { 79 79 var solutionsArchiveName = GetResourceName(FileExtension + @"\.opt\.tour\.zip"); 80 using (var solutionsZipFile = new Zip File(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName))) {80 using (var solutionsZipFile = new ZipArchive(GetType().Assembly.GetManifestResourceStream(solutionsArchiveName), ZipArchiveMode.Read)) { 81 81 entry = solutionsZipFile.GetEntry(descriptor.SolutionIdentifier); 82 stream = solutionsZipFile.GetInputStream(entry);82 stream = entry.Open(); 83 83 parser = new TSPLIBParser(stream); 84 84 LoadSolution(parser, instance); … … 105 105 return "Embedded instance of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().First().Version + "."; 106 106 } 107 108 protected IEnumerable<string> GetZipContents(ZipInputStream zipFile) {109 ZipEntry entry;110 while ((entry = zipFile.GetNextEntry()) != null) {111 yield return entry.Name;112 }113 }114 107 } 115 108 }
Note: See TracChangeset
for help on using the changeset viewer.