Changeset 8777 for branches/DynamicVehicleRouting

Timestamp:

10/10/12 12:02:42 (12 years ago)

Author:

svonolfe

Message:

Added priority dispatching metaoptimization (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• HeuristicLab.PDPSimulation-3.3.csproj (modified) (1 diff)
• Operators/PriorityDispatchingMetaOptEvaluator.cs (added)
• Optimizers/LocalUpdate/PriorityDispatching.cs (modified) (2 diffs)
• PickupDeliveryAnalyzer.cs (modified) (2 diffs)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/HeuristicLab.PDPSimulation-3.3.csproj

@@ -189 +189 @@
     <Compile Include="Operators\DynPushForwardInsertionCreator.cs" />
     <Compile Include="Operators\DynPDPProblemInstance.cs" />
+    <Compile Include="Operators\PriorityDispatchingMetaOptEvaluator.cs" />
     <Compile Include="Optimizers\DynamicPDProblemInstance.cs" />
     <Compile Include="Optimizers\DynamicPDPOptimization.cs" />

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

@@ -76 +76 @@
           waitingOrders.Remove(order);
 
-          Debug.Assert(!GetOrders().Where(o => o.AssignedVehicle == bestVehicle.Id && o.OrderState == OrderState.Waiting).Any(), "An order has already been assigned to the vehicle");
+          foreach (var assignedOrder in GetOrders().Where(o => o.AssignedVehicle == bestVehicle.Id && o.OrderState == OrderState.Waiting))
+            assignedOrder.AssignedVehicle = Guid.Empty;
 
           order.AssignedVehicle = bestVehicle.Id;
@@ -85 +86 @@
 
     private void GetHighestPriorityOrder(DynPDPProblemInstance instance, Vehicle vehicle, IEnumerable<Order> orders, out Order order, out double priority) {
-      var weights = WeightsParameter.ActualValue;
+      var weights = WeightsParameter.Value;
       Order best = null;
       double bestPriority = double.MinValue;

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/PickupDeliveryAnalyzer.cs

@@ -209 +209 @@
         row.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
         data.Rows.Add(row);
+
+        results.Add(new Result("LeadTime", new DoubleValue()));
       }
 
@@ -235 +237 @@
 
       //lead time
+      double leadTime = 0;
+
       values = timeHistogram.Rows["LeadTime"].Values;
       values.Clear();
       foreach (Order order in simulation.Orders.Where(o => o.OrderState == OrderState.Delivered)) {
-        values.Add(order.DeliveryTime + order.DeliveryServiceTime - order.PickupReadyTime);
-      }
+        double orderLeadTime = order.DeliveryTime + order.DeliveryServiceTime - order.PickupReadyTime;
+        values.Add(orderLeadTime);
+        leadTime += orderLeadTime;
+      }
+
+      (results["LeadTime"].Value as DoubleValue).Value = leadTime;
 
       results["TimeHistogram"].Value = timeHistogram;