- Timestamp:
- 09/14/12 18:58:15 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.QAPLIB/3.3/HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj
r7645 r8660 102 102 </PropertyGroup> 103 103 <ItemGroup> 104 <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> 105 <Private>False</Private> 106 </Reference> 104 <Reference Include="ICSharpCode.SharpZipLib"> 105 <HintPath>..\..\HeuristicLab.PluginInfrastructure\3.3\ICSharpCode.SharpZipLib.dll</HintPath> 106 <Private>False</Private> 107 </Reference> 107 108 <Reference Include="System" /> 108 109 <Reference Include="System.Core" /> … … 143 144 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 144 145 <PropertyGroup> 145 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)146 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 146 147 set ProjectDir=$(ProjectDir) 147 148 set SolutionDir=$(SolutionDir) … … 149 150 150 151 call PreBuildEvent.cmd</PreBuildEvent> 152 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 153 export ProjectDir=$(ProjectDir) 154 export SolutionDir=$(SolutionDir) 155 156 $SolutionDir/PreBuildEvent.sh 157 </PreBuildEvent> 151 158 </PropertyGroup> 152 159 <PropertyGroup> -
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.QAPLIB/3.3/Plugin.cs.frame
r7558 r8660 23 23 24 24 namespace HeuristicLab.Problems.Instances { 25 [Plugin("HeuristicLab.Problems.Instances.QAPLIB", "3.3. 6.$WCREV$")]25 [Plugin("HeuristicLab.Problems.Instances.QAPLIB", "3.3.7.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.Instances.QAPLIB-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Problems.Instances", "3.3")] -
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.QAPLIB/3.3/Properties/AssemblyInfo.cs.frame
r7443 r8660 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs
r8206 r8660 65 65 "esc16j", 66 66 "esc32a", 67 "esc32b", 68 "esc32c", 69 "esc32d", 67 70 "esc32e", 68 71 "esc32f", 69 72 "esc32g", 73 "esc32h", 70 74 "had12", 71 75 "had14", … … 126 130 "tai25a", 127 131 "tai25b", 132 "tai30a", 128 133 "tai30b", 134 "tai35a", 129 135 "tai35b", 136 "tai40a", 130 137 "tai40b", 131 138 "tai50a", … … 204 211 205 212 int[] assignment = slnParser.Assignment; 206 if ( reversedSolutions.Contains(instance.Name)) {213 if (assignment != null && reversedSolutions.Contains(instance.Name)) { 207 214 assignment = (int[])slnParser.Assignment.Clone(); 208 215 for (int i = 0; i < assignment.Length; i++) -
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBSolutionParser.cs
r7445 r8660 90 90 string valLine = reader.ReadLine(); 91 91 string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries); 92 if (vals.Length == 0) continue; 92 93 for (int j = 0; j < vals.Length; j++) { 93 94 if (valueAsLocation) … … 96 97 } 97 98 } 99 if (read < Size) Assignment = null; 98 100 return true; 99 101 } catch (Exception e) {
Note: See TracChangeset
for help on using the changeset viewer.