Changeset 8779

Timestamp:

10/10/12 13:10:57 (12 years ago)

Author:

svonolfe

Message:

Improved coordination between optimization and simulation thread (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• PickupDeliveryOptimization.cs (modified) (1 diff)
• PickupDeliverySimulation.cs (modified) (1 diff)

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

@@ -365 +365 @@
     }
 
-    public void WaitForExit() {
-      while (Running()) {
-        Thread.Sleep(100);
-        SignalWaitHandle();
-      }
+    public void Exit() {
       optThread = null;
     }

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

@@ -536 +536 @@
 
     private void WaitForOptimizationExit() {
-      if (Optimization != null)
-        Optimization.WaitForExit();
+      if (Optimization != null) {
+        while (Optimization.Running()) {
+          Thread.Sleep(100);
+          SignalWaitHandle();
+        }
+        Optimization.Exit();
+      }
     }