Changeset 8791

Timestamp:

10/11/12 13:40:54 (12 years ago)

Author:

svonolfe

Message:

Fixed order generation (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• OrderGenerators/PickupDeliveryPredefinedOrderGenerator.cs (modified) (1 diff)
• PickupDeliverySimulation.cs (modified) (3 diffs)

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3/OrderGenerators/PickupDeliveryPredefinedOrderGenerator.cs

@@ -130 +130 @@
       for (int i = 0; i < orderMatrix.Rows; i++) {
         double revealedTime = orderMatrix[i, 0];
-        if (revealedTime >= timeStart && revealedTime < timeEnd) {
+        if ((timeStart == timeEnd && revealedTime == timeStart) || (revealedTime >= timeStart && revealedTime < timeEnd)) {
           Order order = new Order();
           order.OrderState = OrderState.Waiting;

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

@@ -426 +426 @@
       simulationObject = new SimulationObject();
       lastResultCollection = 0;
-      newSimulationTime = TimeStep;
+      newSimulationTime = 0;
 
       //create vehicles
@@ -473 +473 @@
           Thread.Sleep(InitialDelayParameter.Value.Value);
         }
+
+        Step();
       }
     }
@@ -562 +564 @@
     }
 
+    private void Step() {
+      //next step
+      SimulationTime = newSimulationTime;
+      newSimulationTime = SimulationTime + TimeStep;
+    }
+
     protected override void Run(CancellationToken cancellationToken) {
       InitSimulation();
 
-      while (!AllOrdersDelivered() || Scenario.MoreOrders(newSimulationTime) || (Scenario.RelocateBackToDepot && !AllVehiclesAtDepot())) {
+      while (!AllOrdersDelivered() || Scenario.MoreOrders(SimulationTime) || (Scenario.RelocateBackToDepot && !AllVehiclesAtDepot())) {
         //perform actions
         UpdateSimulationState();
-
-        //next step
-        SimulationTime = newSimulationTime;
-        newSimulationTime = SimulationTime + TimeStep;
-
         UpdateOrders();
         UpdateResults(false);
+
+        Step();
 
         if (OptimizationRequired()) {