Changeset 7807 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs

Timestamp:

05/14/12 15:59:39 (12 years ago)

Author:

abeham

Message:

#1614, #1848

• updated extension methods and operators that use them

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs

@@ -79 +79 @@
       }
 
-      var sourceLocation = overbookedLocations.ChooseUniformRandom(random);
-      int equipmentToRelocate = groupedLocations[sourceLocation.Key].ChooseUniformRandom(random);
+      var sourceLocation = overbookedLocations.SampleRandom(random);
+      int equipmentToRelocate = groupedLocations[sourceLocation.Key].SampleRandom(random);
       var bestFreeLocations = freeLocations.Where(x => capacities[x.Key] > x.Value + demands[equipmentToRelocate]);
 
       if (bestFreeLocations.Any()) { // a feasible solution will still be feasible, an infeasible solution might become feasible
-        var selected = bestFreeLocations.ChooseUniformRandom(random);
+        var selected = bestFreeLocations.SampleRandom(random);
         assignment[equipmentToRelocate] = sourceLocation.Key;
       } else { // the solution will become infeasible
-        sourceLocation = freeLocations.ChooseUniformRandom(random);
+        sourceLocation = freeLocations.SampleRandom(random);
         assignment[equipmentToRelocate] = sourceLocation.Key;
       }