Changeset 11167

Timestamp:

07/09/14 20:14:37 (10 years ago)

Author:

ascheibe

Message:

#2210 (re?)merged r10504 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Crossovers/BiasedMultiVRPSolutionCrossover.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Manipulators/BiasedMultiVRPSolutionManipulator.cs (modified) (1 diff)

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

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