Changeset 7432 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GreedyRandomizedSolutionCreator.cs

Timestamp:

01/31/12 15:17:16 (12 years ago)

Author:

abeham

Message:

#1614

• updated gqap (finished path-relinking)
• fixed some bugs

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GreedyRandomizedSolutionCreator.cs (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GreedyRandomizedSolutionCreator.cs

@@ -70 +70 @@
         do {
           if (L.Any() && random.NextDouble() < threshold) {
-            int l = L.ChooseRandom(random);
+            int l = L.ChooseUniformRandom(random);
             L.Remove(l);
             CL.Add(l);
@@ -76 +76 @@
           }
           if (T.Any()) {
-            int f = T.ChooseRandom(random);
+            int f = T.ChooseUniformRandom(random);
             T.Remove(f);
             F.Remove(f);
             CF.Add(f);
-            int l = WithSlackGreaterOrEqual(CL, demands[f], slack).ChooseRandom(random);
+            int l = WithSlackGreaterOrEqual(CL, demands[f], slack).ChooseUniformRandom(random);
             assignment.Add(f, l);
             slack[l] -= demands[f];