Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment/3.3
- Timestamp:
- 07/26/12 09:51:13 (12 years ago)
- Location:
- branches/ScatterSearch (trunk integration)
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ScatterSearch (trunk integration)
- 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/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.QuadraticAssignment merged: 8092,8246
- Property svn:mergeinfo changed
-
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment/3.3/BoundsCalculators/GilmoreLawlerBoundCalculator.cs
r8086 r8331 35 35 for (int k = 0; k < N - 1; k++) 36 36 costs[i, j] += sortedWeights[i, k] * sortedDistances[j, N - 2 - k]; 37 costs[i, j] += weights[i, i] * distances[j, j];37 costs[i, j] += sortedWeights[i, N - 1] * sortedDistances[j, N - 1]; 38 38 } 39 39 } -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment/3.3/Plugin.cs.frame
r8086 r8331 23 23 24 24 namespace HeuristicLab.Problems.QuadraticAssignment { 25 [Plugin("HeuristicLab.Problems.QuadraticAssignment", "3.3. 6.$WCREV$")]25 [Plugin("HeuristicLab.Problems.QuadraticAssignment", "3.3.7.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.QuadraticAssignment-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment/3.3/Properties/AssemblyInfo.cs.frame
r7259 r8331 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$")]
Note: See TracChangeset
for help on using the changeset viewer.