Changeset 4352 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators

Timestamp:

09/01/10 11:13:46 (14 years ago)

Author:

svonolfe

Message:

Merged r4351 of the VRP feature branch into trunk (#1039)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting

Files:

• . (modified) (1 prop)
• 3.3/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerInsertionManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerInversionManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaCustomerSwapManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaIntraRouteInversionManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaLambdaInterchangeManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs (modified) (1 diff)
• 3.3/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs)
• 3.3/Encodings/Alba/Manipulators/CustomerInsertionManipulator.cs (deleted)
• 3.3/Encodings/Alba/Manipulators/CustomerInversionManipulator.cs (deleted)
• 3.3/Encodings/Alba/Manipulators/CustomerSwapManipulator.cs (deleted)
• 3.3/Encodings/Alba/Manipulators/IntraRouteInversionManipulator.cs (deleted)
• 3.3/Encodings/Alba/Manipulators/LambdaInterchangeManipulator.cs (deleted)
• 3.3/Encodings/Alba/Manipulators/PermutationManipulator.cs (deleted)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Manipulators/AlbaManipulator.cs

@@ -62 +62 @@
       IVRPEncoding solution = VRPToursParameter.ActualValue;
       if (!(solution is AlbaEncoding)) {
-        VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value);
+        VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value, DistanceMatrixParameter);
       }