Changeset 8787 for branches

Timestamp:

10/11/12 10:55:42 (12 years ago)

Author:

svonolfe

Message:

improved priority rule (#1955)

File:

• branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Optimizers/LocalUpdate/PriorityDispatching.cs (modified) (4 diffs)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/Optimizers/LocalUpdate/PriorityDispatching.cs

@@ -90 +90 @@
                 AppendAction(deliveryAction);
               }
+              waitingOrders.Remove(pickedupOrder);
             }
           }
@@ -134 +135 @@
            if (!IsPickup(o, instance)) target = new XY(o.DeliveryXCoord, o.DeliveryYCoord);
 
-           var destinationDifference = destinations.Select(x => scenario.DistanceMeasure.GetDistance(o.DeliveryXCoord, o.DeliveryYCoord, x.X, x.Y)).ToArray();
+           var destinationDifference = destinations.Select(x => scenario.DistanceMeasure.GetDistance(target.X, target.Y, x.X, x.Y)).ToArray();
            var courierDifference = GetVehicles().Where(x => x != vehicle).Select(x => new XY(x.TargetPositionX, x.TargetPositionY))
              .Select(x => scenario.DistanceMeasure.GetDistance(target.X, target.Y, x.X, x.Y)).ToArray();
@@ -159 +160 @@
            variables.Add("MaximumDistanceToOtherCouriers", courierDifference.Any() ? courierDifference.Max() : 0);
            variables.Add("DemandSize", o.Demand);
-           variables.Add("Slack", o.DeliveryDueTime - GetSimulationTime()
-             - (vehicle.ReadyTime + variables["Distance"] +
-                (IsPickup(o, instance) ? (o.PickupServiceTime + scenario.DistanceMeasure.GetDistance(o.PickupXCoord, o.PickupYCoord, o.DeliveryXCoord, o.DeliveryYCoord)) : 0)));
-           variables.Add("EDD", commonDestinations.Any() ? commonDestinations.Min(d => d.DeliveryDueTime - GetSimulationTime()) : 0);
+           variables.Add("EDD", commonDestinations.Any() ? commonDestinations.Min(d => d.DeliveryDueTime
+             - scenario.DistanceMeasure.GetDistance(vehicle.TargetPositionX, vehicle.TargetPositionY, d.DeliveryXCoord, d.DeliveryYCoord)
+             - GetSimulationTime()) : 0);
+           variables.Add("LeadTime", o.PickupReadyTime - GetSimulationTime());
 
            prio =
@@ -181 +182 @@
              + weights[14] * variables["MaximumDistanceToOtherCouriers"]
              + weights[15] * variables["DemandSize"]
-             + weights[16] * variables["Slack"]
-             + weights[17] * variables["EDD"];
+             + weights[16] * variables["EDD"]
+             + weights[17] * variables["LeadTime"];
          }