Changeset 7907 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
- Timestamp:
- 05/25/12 11:34:55 (12 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
- Files:
-
- 42 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
-
Property
svn:mergeinfo
set to
/trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4 merged eligible
-
Property
svn:mergeinfo
set to
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/Capacitated/CapacityRelaxationVRPAnalyzer.cs
r7175 r7907 74 74 75 75 [StorableConstructor] 76 pr ivateCapacityRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }76 protected CapacityRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { } 77 77 78 78 public CapacityRelaxationVRPAnalyzer() … … 95 95 } 96 96 97 pr ivateCapacityRelaxationVRPAnalyzer(CapacityRelaxationVRPAnalyzer original, Cloner cloner)97 protected CapacityRelaxationVRPAnalyzer(CapacityRelaxationVRPAnalyzer original, Cloner cloner) 98 98 : base(original, cloner) { 99 99 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/PickupAndDelivery/PickupViolationsRelaxationVRPAnalyzer.cs
r7175 r7907 74 74 75 75 [StorableConstructor] 76 pr ivatePickupViolationsRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }76 protected PickupViolationsRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { } 77 77 78 78 public PickupViolationsRelaxationVRPAnalyzer() … … 95 95 } 96 96 97 pr ivatePickupViolationsRelaxationVRPAnalyzer(PickupViolationsRelaxationVRPAnalyzer original, Cloner cloner)97 protected PickupViolationsRelaxationVRPAnalyzer(PickupViolationsRelaxationVRPAnalyzer original, Cloner cloner) 98 98 : base(original, cloner) { 99 99 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/ConstraintRelaxation/TimeWindowed/TimeWindowRelaxationVRPAnalyzer.cs
r7175 r7907 74 74 75 75 [StorableConstructor] 76 pr ivateTimeWindowRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { }76 protected TimeWindowRelaxationVRPAnalyzer(bool deserializing) : base(deserializing) { } 77 77 78 78 public TimeWindowRelaxationVRPAnalyzer() … … 95 95 } 96 96 97 pr ivateTimeWindowRelaxationVRPAnalyzer(TimeWindowRelaxationVRPAnalyzer original, Cloner cloner)97 protected TimeWindowRelaxationVRPAnalyzer(TimeWindowRelaxationVRPAnalyzer original, Cloner cloner) 98 98 : base(original, cloner) { 99 99 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs
r7203 r7907 106 106 private VRPSolution(VRPSolution original, Cloner cloner) 107 107 : base(original, cloner) { 108 this.problemInstance = original.problemInstance;109 108 this.solution = (IVRPEncoding)cloner.Clone(original.solution); 110 109 this.quality = (DoubleValue)cloner.Clone(original.quality); 110 111 if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance)) 112 this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance); 113 else 114 this.ProblemInstance = original.ProblemInstance; 111 115 112 116 this.Initialize(); -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/AlbaEncoding.cs
r7543 r7907 109 109 110 110 [StorableConstructor] 111 pr ivateAlbaEncoding(bool serializing)111 protected AlbaEncoding(bool serializing) 112 112 : base(serializing) { 113 113 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMoveMaker.cs
r4752 r7907 41 41 42 42 [StorableConstructor] 43 pr ivateAlbaIntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { }43 protected AlbaIntraRouteInversionMoveMaker(bool deserializing) : base(deserializing) { } 44 44 45 45 public AlbaIntraRouteInversionMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMove.cs
r6772 r7907 80 80 } 81 81 82 [StorableConstructor] 83 protected AlbaLambdaInterchangeMove(bool deserializing) : base(deserializing) { } 84 82 85 public override IDeepCloneable Clone(Cloner cloner) { 83 86 return new AlbaLambdaInterchangeMove(this, cloner); -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaLambdaInterchangeMoveMaker.cs
r4752 r7907 45 45 46 46 [StorableConstructor] 47 pr ivateAlbaLambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { }47 protected AlbaLambdaInterchangeMoveMaker(bool deserializing) : base(deserializing) { } 48 48 49 49 public AlbaLambdaInterchangeMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/GVR/GVREncoding.cs
r6851 r7907 83 83 84 84 [StorableConstructor] 85 pr ivateGVREncoding(bool serializing)85 protected GVREncoding(bool serializing) 86 86 : base(serializing) { 87 87 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Creators/MultiVRPSolutionCreator.cs
r4752 r7907 55 55 56 56 [StorableConstructor] 57 pr ivateMultiVRPSolutionCreator(bool deserializing) : base(deserializing) { }57 protected MultiVRPSolutionCreator(bool deserializing) : base(deserializing) { } 58 58 public MultiVRPSolutionCreator() 59 59 : base() { -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs
r6772 r7907 77 77 78 78 [StorableConstructor] 79 pr ivateMultiVRPMoveGenerator(bool deserializing) : base(deserializing) { }79 protected MultiVRPMoveGenerator(bool deserializing) : base(deserializing) { } 80 80 public MultiVRPMoveGenerator() 81 81 : base() { -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs
r5867 r7907 39 39 40 40 [StorableConstructor] 41 pr ivateMultiVRPMoveMaker(bool deserializing) : base(deserializing) { }41 protected MultiVRPMoveMaker(bool deserializing) : base(deserializing) { } 42 42 43 43 public MultiVRPMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuChecker.cs
r6772 r7907 68 68 69 69 [StorableConstructor] 70 pr ivateMultiVRPMoveTabuChecker(bool deserializing) : base(deserializing) { }70 protected MultiVRPMoveTabuChecker(bool deserializing) : base(deserializing) { } 71 71 72 72 public MultiVRPMoveTabuChecker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveTabuMaker.cs
r6772 r7907 61 61 62 62 [StorableConstructor] 63 pr ivateMultiVRPMoveTabuMaker(bool deserializing) : base(deserializing) { }63 protected MultiVRPMoveTabuMaker(bool deserializing) : base(deserializing) { } 64 64 65 65 public MultiVRPMoveTabuMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/PermutationEncoding.cs
r7855 r7907 60 60 protected PermutationEncoding(PermutationEncoding original, Cloner cloner) 61 61 : base(original, cloner) { 62 this.ProblemInstance = original.ProblemInstance;63 62 this.readOnly = original.readOnly; 63 64 if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance)) 65 this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance); 66 else 67 this.ProblemInstance = original.ProblemInstance; 64 68 } 65 69 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs
r7543 r7907 115 115 : base(original, cloner) { 116 116 this.Tours = (ItemList<Tour>)cloner.Clone(original.Tours); 117 this.ProblemInstance = original.ProblemInstance; 117 if (original.ProblemInstance != null && cloner.ClonedObjectRegistered(original.ProblemInstance)) 118 this.ProblemInstance = (IVRPProblemInstance)cloner.Clone(original.ProblemInstance); 119 else 120 this.ProblemInstance = original.ProblemInstance; 118 121 } 119 122 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationExhaustiveMoveGenerator.cs
r7790 r7907 44 44 } 45 45 46 private PotvinCustomerRelocationExhaustiveMoveGenerator(PotvinCustomerRelocation MoveGenerator original, Cloner cloner)46 private PotvinCustomerRelocationExhaustiveMoveGenerator(PotvinCustomerRelocationExhaustiveMoveGenerator original, Cloner cloner) 47 47 : base(original, cloner) { 48 48 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs
r6772 r7907 74 74 } 75 75 76 [StorableConstructor] 77 protected PotvinCustomerRelocationMove(bool deserializing) : base(deserializing) { } 78 76 79 #region IVRPMove Members 77 80 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs
r7790 r7907 52 52 53 53 [StorableConstructor] 54 pr ivatePotvinCustomerRelocationMoveMaker(bool deserializing) : base(deserializing) { }54 protected PotvinCustomerRelocationMoveMaker(bool deserializing) : base(deserializing) { } 55 55 56 56 public PotvinCustomerRelocationMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs
r5867 r7907 56 56 } 57 57 58 private PotvinCustomerRelocationMultiMoveGenerator(PotvinCustomerRelocationM oveGenerator original, Cloner cloner)58 private PotvinCustomerRelocationMultiMoveGenerator(PotvinCustomerRelocationMultiMoveGenerator original, Cloner cloner) 59 59 : base(original, cloner) { 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs
r5867 r7907 60 60 } 61 61 62 private PotvinCustomerRelocationSingleMoveGenerator(PotvinCustomerRelocation MoveGenerator original, Cloner cloner)62 private PotvinCustomerRelocationSingleMoveGenerator(PotvinCustomerRelocationSingleMoveGenerator original, Cloner cloner) 63 63 : base(original, cloner) { 64 64 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMove.cs
r6787 r7907 65 65 this.Individual = individual.Clone() as PotvinEncoding; 66 66 } 67 68 [StorableConstructor] 69 protected PotvinPDExchangeMove(bool deserializing) : base(deserializing) { } 67 70 68 71 public override IDeepCloneable Clone(Cloner cloner) { -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDExchange/PotvinPDExchangeMoveMaker.cs
r7080 r7907 44 44 45 45 [StorableConstructor] 46 pr ivatePotvinPDExchangeMoveMaker(bool deserializing) : base(deserializing) { }46 protected PotvinPDExchangeMoveMaker(bool deserializing) : base(deserializing) { } 47 47 48 48 public PotvinPDExchangeMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMove.cs
r6787 r7907 70 70 } 71 71 72 [StorableConstructor] 73 protected PotvinPDRearrangeMove(bool deserializing) : base(deserializing) { } 74 72 75 #region IVRPMove Members 73 76 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs
r7080 r7907 44 44 45 45 [StorableConstructor] 46 pr ivatePotvinPDRearrangeMoveMaker(bool deserializing) : base(deserializing) { }46 protected PotvinPDRearrangeMoveMaker(bool deserializing) : base(deserializing) { } 47 47 48 48 public PotvinPDRearrangeMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMove.cs
r6787 r7907 75 75 } 76 76 77 [StorableConstructor] 78 protected PotvinPDShiftMove(bool deserializing) : base(deserializing) { } 79 77 80 #region IVRPMove Members 78 81 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMoveMaker.cs
r7791 r7907 45 45 46 46 [StorableConstructor] 47 pr ivatePotvinPDShiftMoveMaker(bool deserializing) : base(deserializing) { }47 protected PotvinPDShiftMoveMaker(bool deserializing) : base(deserializing) { } 48 48 49 49 public PotvinPDShiftMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarExhaustiveMoveGenerator.cs
r7865 r7907 44 44 } 45 45 46 private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStar MoveGenerator original, Cloner cloner)46 private PotvinTwoOptStarExhaustiveMoveGenerator(PotvinTwoOptStarExhaustiveMoveGenerator original, Cloner cloner) 47 47 : base(original, cloner) { 48 48 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMove.cs
r7865 r7907 81 81 } 82 82 83 [StorableConstructor] 84 protected PotvinTwoOptStarMove(bool deserializing) : base(deserializing) { } 85 83 86 #region IVRPMove Members 84 87 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMoveMaker.cs
r7865 r7907 45 45 46 46 [StorableConstructor] 47 pr ivatePotvinTwoOptStarMoveMaker(bool deserializing) : base(deserializing) { }47 protected PotvinTwoOptStarMoveMaker(bool deserializing) : base(deserializing) { } 48 48 49 49 public PotvinTwoOptStarMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarMultiMoveGenerator.cs
r7865 r7907 56 56 } 57 57 58 private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarM oveGenerator original, Cloner cloner)58 private PotvinTwoOptStarMultiMoveGenerator(PotvinTwoOptStarMultiMoveGenerator original, Cloner cloner) 59 59 : base(original, cloner) { 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/TwoOptStar/PotvinTwoOptStarSingleMoveGenerator.cs
r7865 r7907 60 60 } 61 61 62 private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStar MoveGenerator original, Cloner cloner)62 private PotvinTwoOptStarSingleMoveGenerator(PotvinTwoOptStarSingleMoveGenerator original, Cloner cloner) 63 63 : base(original, cloner) { 64 64 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentExhaustiveMoveGenerator.cs
r6857 r7907 44 44 } 45 45 46 private PotvinVehicleAssignmentExhaustiveMoveGenerator(PotvinVehicleAssignment MoveGenerator original, Cloner cloner)46 private PotvinVehicleAssignmentExhaustiveMoveGenerator(PotvinVehicleAssignmentExhaustiveMoveGenerator original, Cloner cloner) 47 47 : base(original, cloner) { 48 48 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMove.cs
r6857 r7907 70 70 } 71 71 72 [StorableConstructor] 73 protected PotvinVehicleAssignmentMove(bool deserializing) : base(deserializing) { } 74 72 75 #region IVRPMove Members 73 76 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMoveMaker.cs
r6857 r7907 52 52 53 53 [StorableConstructor] 54 pr ivatePotvinVehicleAssignmentMoveMaker(bool deserializing) : base(deserializing) { }54 protected PotvinVehicleAssignmentMoveMaker(bool deserializing) : base(deserializing) { } 55 55 56 56 public PotvinVehicleAssignmentMoveMaker() -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentMultiMoveGenerator.cs
r6909 r7907 56 56 } 57 57 58 private PotvinVehicleAssignmentMultiMoveGenerator(PotvinVehicleAssignmentM oveGenerator original, Cloner cloner)58 private PotvinVehicleAssignmentMultiMoveGenerator(PotvinVehicleAssignmentMultiMoveGenerator original, Cloner cloner) 59 59 : base(original, cloner) { 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/VehicleAssignment/PotvinVehicleAssignmentSingleMoveGenerator.cs
r6909 r7907 60 60 } 61 61 62 private PotvinVehicleAssignmentSingleMoveGenerator(PotvinVehicleAssignment MoveGenerator original, Cloner cloner)62 private PotvinVehicleAssignmentSingleMoveGenerator(PotvinVehicleAssignmentSingleMoveGenerator original, Cloner cloner) 63 63 : base(original, cloner) { 64 64 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs
r7856 r7907 140 140 141 141 [StorableConstructor] 142 pr ivatePrinsEncoding(bool serializing)142 protected PrinsEncoding(bool serializing) 143 143 : base(serializing) { 144 144 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Tour.cs
r6851 r7907 48 48 } 49 49 50 [StorableConstructor] 51 protected Tour(bool deserializing) : base(deserializing) { } 52 50 53 public double GetTourLength(IVRPProblemInstance instance, IVRPEncoding solution) { 51 54 double length = 0; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/ZhuEncoding.cs
r7856 r7907 110 110 111 111 [StorableConstructor] 112 pr ivateZhuEncoding(bool serializing)112 protected ZhuEncoding(bool serializing) 113 113 : base(serializing) { 114 114 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs
r7894 r7907 143 143 144 144 public override IDeepCloneable Clone(Cloner cloner) { 145 cloner.Clone(ProblemInstance); 145 146 return new VehicleRoutingProblem(this, cloner); 146 147 }
Note: See TracChangeset
for help on using the changeset viewer.