Changeset 7833 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs

Timestamp:

05/16/12 00:49:26 (13 years ago)

Author:

abeham

Message:

#1614

• made GRASP+PR an IStorableContent
• fixed bug in GreedyRandomizedSolutionCreator

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs (modified) (1 diff)

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

@@ -107 +107 @@
         } else if (createMostFeasibleSolution) {
           // complete the solution and remember the one with least violation
+          foreach (var l in L.ToArray()) {
+            CL.Add(l);
+            L.Remove(l);
+          }
           while (F.Any()) {
             var f = F.MaxItems(x => demands[x]).SampleRandom(random);
-            var l = L.MaxItems(x => slack[x]).SampleRandom(random);
+            var l = CL.MaxItems(x => slack[x]).SampleRandom(random);
             F.Remove(f);
             assignment.Add(f, l);