Changeset 8092 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/BoundsCalculators

Timestamp:

06/24/12 13:56:49 (13 years ago)

Author:

abeham

Message:

#1856: Added unit test for lower bound, made it more obvious that last element is not left out

File:

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

trunk/sources/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];
         }
       }