Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/19/10 16:51:30 (14 years ago)
Author:
svonolfe
Message:

Added prins encoding (#1039)

Location:
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/AlbaMoveOperator.cs

    r4204 r4268  
    4141      IVRPEncoding solution = VRPToursParameter.ActualValue;
    4242      if (!(solution is AlbaEncoding)) {
    43         VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value);
     43        VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value,
     44          DistanceMatrixParameter);
    4445      }
    4546

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionEvaluator.cs

    r4206 r4268  
    4444
    4545    public static TourEvaluation GetMoveQuality(AlbaEncoding individual, IntraRouteInversionMove move,
     46      IntValue vehicles,
    4647      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray,
    4748      DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
    … …  
    5354
    5455      return VRPEvaluator.Evaluate(
    55         newSolution, dueTimeArray, serviceTimeArray, readyTimeArray,
     56        newSolution, vehicles, dueTimeArray, serviceTimeArray, readyTimeArray,
    5657        demandArray, capacity, fleetUsageFactor, timeFactor, distanceFactor,
    5758        overloadPenalty, tardinessPenalty, coordinates, distanceMatrix, useDistanceMatrix);
    … …  
    6162      return GetMoveQuality(
    6263        VRPToursParameter.ActualValue as AlbaEncoding, IntraRouteInversionMoveParameter.ActualValue,
     64        VehiclesParameter.ActualValue,
    6365        DueTimeParameter.ActualValue, ServiceTimeParameter.ActualValue, ReadyTimeParameter.ActualValue,
    6466        DemandParameter.ActualValue, CapacityParameter.ActualValue, CoordinatesParameter.ActualValue,

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/IntraRouteInversion/IntraRouteInversionMove.cs

    r4206 r4268  
    5757
    5858    public TourEvaluation GetMoveQuality(
    59       IVRPEncoding individual,
     59      IVRPEncoding individual, IntValue vehicles,
    6060      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray,
    6161      DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
    … …  
    6363      DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
    6464      ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
    65         return IntraRouteInversionMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,
     65        return IntraRouteInversionMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this, vehicles,
    6666          dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
    6767          coordinates, fleetUsageFactor, timeFactor, distanceFactor,

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/LambdaInterchangeMove.cs

    r4206 r4268  
    8989
    9090    public TourEvaluation GetMoveQuality(
    91       IVRPEncoding individual,
     91      IVRPEncoding individual, IntValue vehicles,
    9292      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray,
    9393      DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
    … …  
    9595      DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
    9696      ILookupParameter<DoubleMatrix> distanceMatrix, Data.BoolValue useDistanceMatrix) {
    97         return LambdaInterchangeMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,
     97        return LambdaInterchangeMoveEvaluator.GetMoveQuality(individual as AlbaEncoding, this,  vehicles,
    9898          dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
    9999          coordinates, fleetUsageFactor, timeFactor, distanceFactor,

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/LambdaInterchange/LambdaInterchangeMoveEvaluator.cs

    r4206 r4268  
    4444
    4545    public static TourEvaluation GetMoveQuality(AlbaEncoding individual, LambdaInterchangeMove move,
     46      IntValue vehicles,
    4647      DoubleArray dueTimeArray, DoubleArray serviceTimeArray, DoubleArray readyTimeArray,
    4748      DoubleArray demandArray, DoubleValue capacity, DoubleMatrix coordinates,
    … …  
    5354
    5455      return VRPEvaluator.Evaluate(
    55         newSolution, dueTimeArray, serviceTimeArray, readyTimeArray,
     56        newSolution, vehicles, dueTimeArray, serviceTimeArray, readyTimeArray,
    5657        demandArray, capacity, fleetUsageFactor, timeFactor, distanceFactor,
    5758        overloadPenalty, tardinessPenalty, coordinates, distanceMatrix, useDistanceMatrix);
    … …  
    6162      return GetMoveQuality(
    6263        VRPToursParameter.ActualValue as AlbaEncoding, LambdaInterchangeMoveParameter.ActualValue,
     64        VehiclesParameter.ActualValue,
    6365        DueTimeParameter.ActualValue, ServiceTimeParameter.ActualValue, ReadyTimeParameter.ActualValue,
    6466        DemandParameter.ActualValue, CapacityParameter.ActualValue, CoordinatesParameter.ActualValue,

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/Moves/ThreeOpt/PermutationTranslocationMoveEvaluator.cs

    r4208 r4268  
    5151      return VRPEvaluator.Evaluate(
    5252        newSolution,
     53        VehiclesParameter.ActualValue,
    5354        DueTimeParameter.ActualValue, ServiceTimeParameter.ActualValue, ReadyTimeParameter.ActualValue,
    5455        DemandParameter.ActualValue, CapacityParameter.ActualValue,
Note: See TracChangeset for help on using the changeset viewer.