- Timestamp:
- 02/25/14 14:00:47 (11 years ago)
- Location:
- stable
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 10149,10231,10261,10291-10292,10295,10298
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 10295,10298
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinCustomerRelocationMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding; -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinPDExchangeMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding; -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinPDRearrangeMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding; -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinPDShiftMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding; -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PotvinMoveGenerator.cs
r9456 r10507 41 41 } 42 42 43 public override IOperation Apply() {43 public override IOperation InstrumentedApply() { 44 44 IVRPEncoding solution = VRPToursParameter.ActualValue; 45 45 if (!(solution is PotvinEncoding)) { … … 47 47 } 48 48 49 return base. Apply();49 return base.InstrumentedApply(); 50 50 } 51 51 } -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinTwoOptStarMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding; -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveGenerator.cs
r9456 r10507 57 57 protected abstract PotvinVehicleAssignmentMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance); 58 58 59 public override IOperation Apply() {60 IOperation next = base. Apply();59 public override IOperation InstrumentedApply() { 60 IOperation next = base.InstrumentedApply(); 61 61 62 62 PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;
Note: See TracChangeset
for help on using the changeset viewer.