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

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

Files:

• Analyzers/BestGQAPSolutionAnalyzer.cs (modified) (1 diff)
• Operators/Crossovers/GQAPPathRelinking.cs (modified) (2 diffs)
• Operators/Manipulators/DemandEquivalentSwapEquipmentManipluator.cs (modified) (1 diff)
• Operators/Manipulators/RelocateEquipmentManipluator.cs (modified) (1 diff)
• SolutionCreators/GreedyRandomizedSolutionCreator.cs (modified) (3 diffs)
• SolutionCreators/RandomButFeasibleSolutionCreator.cs (modified) (1 diff)
• SolutionCreators/SlackMinimizationSolutionCreator.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/BestGQAPSolutionAnalyzer.cs

@@ -157 +157 @@
       int bestIndex;
       var tmp = qualities.Select((x, index) => new { Index = index, Value = x.Value });
-      if (maximization) bestIndex = tmp.ChooseMax(x => x.Value).Index;
-      else bestIndex = tmp.ChooseMin(x => x.Value).Index;
+      if (maximization) bestIndex = tmp.MaxItems(x => x.Value).First().Index;
+      else bestIndex = tmp.MinItems(x => x.Value).First().Index;
 
       if (bestKnownQuality == null || HasSolutionImproved(bestKnownQuality.Value, qualities[bestIndex].Value, maximization)) {

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

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

@@ -84 +84 @@
         do {
           if (L.Any() && random.NextDouble() < threshold) {
-            int l = L.ChooseUniformRandom(random);
+            int l = L.SampleRandom(random);
             L.Remove(l);
             CL.Add(l);
@@ -90 +90 @@
           }
           if (T.Any()) {
-            int f = T.ChooseUniformRandom(random);
+            int f = T.SampleRandom(random);
             T.Remove(f);
             F.Remove(f);
             CF.Add(f);
-            int l = WithSlackGreaterOrEqual(CL, demands[f], slack).ChooseUniformRandom(random);
+            int l = WithSlackGreaterOrEqual(CL, demands[f], slack).SampleRandom(random);
             assignment.Add(f, l);
             slack[l] -= demands[f];
@@ -108 +108 @@
           // complete the solution and remember the one with least violation
           while (F.Any()) {
-            var f = F.ChooseMax(x => demands[x]);
-            var l = L.ChooseMax(x => slack[x]);
+            var f = F.MaxItems(x => demands[x]).SampleRandom(random);
+            var l = L.MaxItems(x => slack[x]).SampleRandom(random);
             F.Remove(f);
             assignment.Add(f, l);

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

@@ -77 +77 @@
         foreach (var equipment in Enumerable.Range(0, demands.Length).Shuffle(random)) {
           var freeLocations = GetFreeLocations(equipment, demands, slack);
-          assignment[equipment] = freeLocations.ChooseUniformRandom(random);
+          assignment[equipment] = freeLocations.SampleRandom(random);
           slack[assignment[equipment]] -= demands[equipment];
         }

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

@@ -111 +111 @@
           // complete the solution
           while (remainingEquipment.Any()) {
-            var f = remainingEquipment.ChooseMax(x => demands[x]);
-            var l = Enumerable.Range(0, capacities.Length).ChooseMax(x => slack[x]);
+            var f = remainingEquipment.MaxItems(x => demands[x]).SampleRandom(random);
+            var l = Enumerable.Range(0, capacities.Length).MaxItems(x => slack[x]).SampleRandom(random);
             remainingEquipment.Remove(f);
             assignment.Add(f, l);
@@ -133 +133 @@
       if (!feasibleEquipment.Any()) yield break;
       if (depth == 0) {
-        var e = feasibleEquipment.ChooseMax(x => demands[x]);
+        var e = feasibleEquipment.MaxItems(x => demands[x]).First();
         yield return e;
         yield break;
@@ -164 +164 @@
                 && slack[assignment[e]] + demands[e] - demands[x] >= 0);
           if (!partners.Any()) continue;
-          var f = partners.ChooseUniformRandom(random);
+          var f = partners.SampleRandom(random);
           int h = assignment[e];
           assignment[e] = assignment[f];