Changeset 10504 for trunk

Timestamp:

02/25/14 10:24:20 (11 years ago)

Author:

abeham

Message:

#2146: fixed bug in biased vrp multi operators that was introduced through the recent changes

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General

Files:

• Crossovers/BiasedMultiVRPSolutionCrossover.cs (modified) (1 diff)
• Manipulators/BiasedMultiVRPSolutionManipulator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/BiasedMultiVRPSolutionCrossover.cs

@@ -143 +143 @@
       if (checkedOperators.Count() > 0) {
         // select a random operator from the checked operators
-        successor = checkedOperators.SampleProportional(random, 1, probabilities, false, false).First().Value;
+        successor = checkedOperators.SampleProportional(random, 1, checkedOperators.Select(x => probabilities[x.Index]), false, false).First().Value;
       }
 

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.cs

@@ -144 +144 @@
         // select a random operator from the checked operators
         successor =
-          checkedOperators.SampleProportional(random, 1, probabilities, false, false).First().Value;
+          checkedOperators.SampleProportional(random, 1, checkedOperators.Select(x => probabilities[x.Index]), false, false).First().Value;
       }