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

Timestamp:

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

Author:

abeham

Message:

#1614, #1848

• updated extension methods and operators that use them

Location:

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

Files:

• Crossovers/GQAPPathRelinking.cs (modified) (2 diffs)
• Manipulators/DemandEquivalentSwapEquipmentManipluator.cs (modified) (1 diff)
• Manipulators/RelocateEquipmentManipluator.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs

@@ -183 +183 @@
         if (B.Any()) {
           GQAPSolution pi;
-          if (maximization.Value) pi = B.ChooseProportionalRandom(random, 1, x => x.Quality.Value, false, true).First();
-          else pi = B.ChooseProportionalRandom(random, 1, x => 1.0 / x.Quality.Value, false, true).First();
+          if (maximization.Value) pi = B.SampleProportional(random, 1, B.Select(x => x.Quality.Value), false).First();
+          else pi = B.SampleProportional(random, 1, B.Select(x => 1.0 / x.Quality.Value), false).First();
           var diff = IntegerVectorEqualityComparer.GetDifferingIndices(pi.Assignment, target);
           var I = phi.Except(diff);
-          var i = I.ChooseUniformRandom(random);
+          var i = I.SampleRandom(random);
           fix.Add(i);
           nonFix.Remove(i);
@@ -226 +226 @@
           var T = nonFix.Where(x => x != equipment && assignment[x] == l && demands[x] <= maxSlack);
           if (T.Any()) {
-            int i = T.ChooseProportionalRandom(random, 1, x => demands[x], false, true).First();
-            var j = Enumerable.Range(0, capacities.Length).Where(x => slack[x] >= demands[i]).ChooseUniformRandom(random);
+            int i = T.SampleProportional(random, 1, T.Select(x => demands[x]), false).First();
+            var j = Enumerable.Range(0, capacities.Length).Where(x => slack[x] >= demands[i]).SampleRandom(random);
             result[i] = j;
             slack[j] -= demands[i];

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

@@ -80 +80 @@
           groupedLocations[location2].Remove(equipment2);
           if (!groupedLocations[location2].Any()) break;
-          equipment2 = groupedLocations[location2].ChooseUniformRandom(random);
+          equipment2 = groupedLocations[location2].SampleRandom(random);
         }
       }

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;
       }