Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.QuadraticAssignment/3.3/BoundsCalculators

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
• HeuristicLab.Problems.QuadraticAssignment/3.3/BoundsCalculators/GilmoreLawlerBoundCalculator.cs (modified) (1 diff)

branches/GP-MoveOperators/HeuristicLab.Problems.QuadraticAssignment/3.3/BoundsCalculators/GilmoreLawlerBoundCalculator.cs

@@ -35 +35 @@
           for (int k = 0; k < N - 1; k++)
             costs[i, j] += sortedWeights[i, k] * sortedDistances[j, N - 2 - k];
-          costs[i, j] += weights[i, i] * distances[j, j];
+          costs[i, j] += sortedWeights[i, N - 1] * sortedDistances[j, N - 1];
         }
       }