- Timestamp:
- 06/05/14 07:16:44 (11 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 10924,10926-10927
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.VehicleRouting merged: 10924,10926
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveGenerator.cs
r10507 r10954 31 31 using HeuristicLab.Parameters; 32 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 using HeuristicLab.Problems.VehicleRouting.Encodings.Alba; 34 using HeuristicLab.Problems.VehicleRouting.Encodings.Potvin; 33 35 using HeuristicLab.Problems.VehicleRouting.Interfaces; 34 36 using HeuristicLab.Problems.VehicleRouting.Variants; … … 99 101 foreach (IOperator op in operators) { 100 102 if (op is IMultiVRPMoveGenerator && !(op is MultiOperator<IMultiVRPMoveGenerator>)) { 101 Operators.Add(op.Clone() as IMultiVRPMoveGenerator, true);103 Operators.Add(op.Clone() as IMultiVRPMoveGenerator, !(op is IAlbaOperator || op is PotvinVehicleAssignmentMultiMoveGenerator)); 102 104 } 103 105 } -
stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuCriterion.cs
r9456 r10954 20 20 #endregion 21 21 22 using System.Linq; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; … … 98 99 PotvinCustomerRelocationMove move = CustomerRelocationMoveParameter.ActualValue; 99 100 100 foreach (IItem tabuMove in tabuList) { 101 PotvinCustomerRelocationMoveAttribute attribute = tabuMove as PotvinCustomerRelocationMoveAttribute; 102 101 foreach (var attribute in tabuList.OfType<PotvinCustomerRelocationMoveAttribute>()) { 103 102 if (!useAspiration || moveQuality >= attribute.MoveQuality) { 104 103 if (attribute.City == move.City && attribute.Tour == move.Tour) {
Note: See TracChangeset
for help on using the changeset viewer.