Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange
- Timestamp:
- 09/29/11 15:51:56 (13 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeExhaustiveMoveGenerator.cs
r6773 r6851 54 54 55 55 for (int i = 1; i <= problemInstance.Cities.Value; i++) { 56 if (pdp == null || pdp. Demand[i]>= 0) {56 if (pdp == null || pdp.GetDemand(i) >= 0) { 57 57 int tour = individual.Tours.FindIndex(t => t.Stops.Contains(i)); 58 58 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs
r6838 r6851 74 74 if (positionToAvoid != i || positionToAvoid2 != j || stops == 0) { 75 75 bool feasible; 76 double targetCosts = problemInstance.GetInsertionCosts(tourEval, target, 0, j, out feasible);76 double targetCosts = problemInstance.GetInsertionCosts(tourEval, solution, target, 0, j, out feasible); 77 77 78 78 double costs = sourceCosts + targetCosts; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeSingleMoveGenerator.cs
r6773 r6851 62 62 IPickupAndDeliveryProblemInstance pdp = problemInstance as IPickupAndDeliveryProblemInstance; 63 63 for (int i = 1; i <= individual.Cities; i++) { 64 if(pdp == null || pdp. Demand[i]>= 0)64 if(pdp == null || pdp.GetDemand(i) >= 0) 65 65 cities.Add(i); 66 66 }
Note: See TracChangeset
for help on using the changeset viewer.