Changeset 8747

Timestamp:

10/05/12 16:04:40 (12 years ago)

Author:

abeham

Message:

#1955:

• Added priority dispatching (random strategy)
• Fixed vehicle's current order

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• HeuristicLab.PDPSimulation-3.3.csproj (modified) (1 diff)
• Optimizers/LocalUpdate/PriorityDispatching.cs (added)
• SimulationModel/MoveVehicleAction.cs (modified) (5 diffs)

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

@@ -188 +188 @@
     <Compile Include="Optimizers\DynamicPDPOptimization.cs" />
     <Compile Include="Optimizers\LocalUpdate\BestInsertion.cs" />
+    <Compile Include="Optimizers\LocalUpdate\PriorityDispatching.cs" />
     <Compile Include="Optimizers\Reoptimization\PFIHReoptimization.cs" />
     <Compile Include="Parsers\DefaultDynPDPParser.cs" />

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/SimulationModel/MoveVehicleAction.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.PDPSimulation.DistanceMeasures;
+using HeuristicLab.PDPSimulation.DomainModel;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Common;
-using HeuristicLab.PDPSimulation.DomainModel;
-using HeuristicLab.PDPSimulation.DistanceMeasures;
 
 namespace HeuristicLab.PDPSimulation {
-  public enum VehicleAction { Wait, Pickup, Deliver, Park, Invalid }  
-  
+  public enum VehicleAction { Wait, Pickup, Deliver, Park, Invalid }
+
   [StorableClass]
-  public class MoveVehicleAction: PDAction {    
+  public class MoveVehicleAction : PDAction {
     [Storable]
     double sourceX;
@@ -26 +24 @@
       get { return sourceY; }
     }
-    
+
     [Storable]
     double targetX;
@@ -63 +61 @@
 
     public MoveVehicleAction(
-      Guid vehicleId, 
+      Guid vehicleId,
       double targetX, double targetY, VehicleAction action, Order order, bool diversionAllowed, DistanceMeasure distMeasure)
       : base(vehicleId) {
-        this.targetX = targetX;
-        this.targetY = targetY;
-        this.action = action;
-        this.order = order;
-        this.serviceTime = 0;
-        this.completed = false;
-        this.diversionAllowed = diversionAllowed;
-        this.interruptable = diversionAllowed;
-        this.distMeasure = distMeasure;
-
-        this.sourceX = -1;
-        this.sourceY = -1;
+      this.targetX = targetX;
+      this.targetY = targetY;
+      this.action = action;
+      this.order = order;
+      this.serviceTime = 0;
+      this.completed = false;
+      this.diversionAllowed = diversionAllowed;
+      this.interruptable = diversionAllowed;
+      this.distMeasure = distMeasure;
+
+      this.sourceX = -1;
+      this.sourceY = -1;
     }
     [StorableConstructor]
-    protected MoveVehicleAction(bool deserializing) : base(deserializing) {
+    protected MoveVehicleAction(bool deserializing)
+      : base(deserializing) {
     }
     protected MoveVehicleAction(MoveVehicleAction original, Cloner cloner)
@@ -266 +265 @@
                 else
                   order.OrderState = OrderState.PickedUp;
+                vehicle.CurrentOrder = Guid.Empty;
                 changes.Add(new PDChange() { ChangeType = SimulationStateChange.OrderState, BaseObject = order });
 
@@ -332 +332 @@
                 changes.Add(new PDChange() { ChangeType = SimulationStateChange.OrderState, BaseObject = order });
 
+                vehicle.CurrentOrder = Guid.Empty;
+
                 vehicle.VehicleState = VehicleState.Waiting;
                 changes.Add(new PDChange() { ChangeType = SimulationStateChange.VehicleState, BaseObject = baseObject });