Changeset 8792 for branches/DynamicVehicleRouting

Timestamp:

10/11/12 14:04:58 (12 years ago)

Author:

svonolfe

Message:

Improved performance when small time steps are used (#1955)

Location:

branches/DynamicVehicleRouting/HeuristicLab.PDPSimulation/3.3

Files:

• PickupDeliveryAnalyzer.cs (modified) (1 diff)
• PickupDeliverySimulation.cs (modified) (9 diffs)

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

@@ -262 +262 @@
     }
 
+    protected virtual void UpdateSimulationTime(PickupDeliverySimulation simulation, PickupDeliveryScenario scenario, ResultCollection results) {
+      if (!results.ContainsKey("SimulationTime")) {
+        results.Add(new Result("SimulationTime", new DoubleValue()));
+      }
+
+      (results["SimulationTime"].Value as DoubleValue).Value = simulation.SimulationTime;
+    }
+
     public virtual void Analyze(PickupDeliverySimulation simulation, PickupDeliveryScenario scenario, ResultCollection results) {
+      UpdateSimulationTime(simulation, scenario, results);
       UpdateOrderResults(simulation, scenario, results);
       UpdateVehicleResults(simulation, scenario, results);

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

@@ -83 +83 @@
     public double SimulationTime {
       get {
-        if (!Results.ContainsKey("SimulationTime")) {
-          return 0;
-        } else {
-          DoubleValue simulationTime =
-            (Results["SimulationTime"].Value as DoubleValue);
-          return simulationTime.Value;
-        }
+        return simulationTime;
       }
 
       private set {
-        if (!Results.ContainsKey("SimulationTime")) {
-          Results.Add(new Result("SimulationTime", new DoubleValue(0)));
-        }
-
-        Results["SimulationTime"].Value = new DoubleValue(value);
+        simulationTime = value;
       }
     }
@@ -194 +184 @@
       }
 
+      simulationTime = original.simulationTime;
       newSimulationTime = original.newSimulationTime;
       lastResultCollection = original.lastResultCollection;
@@ -322 +313 @@
 
     [Storable]
+    private double simulationTime;
+
+    [Storable]
     private double lastResultCollection;
 
@@ -371 +365 @@
 
     private void UpdateSimulationState() {
-      bool update = false;
       if (Optimization != null) {
         foreach (PDAction action in Optimization.GetActions()) {
@@ -382 +375 @@
           foreach (PDChange change in changes)
             OnSimulationStateChanged(change.BaseObject, change.ChangeType);
-
-          if (changes.Count > 0)
-            update = true;
-        }
-      }
-
-      if (update)
-        UpdateVisualization();
+        }
+      }
     }
 
@@ -395 +382 @@
       if (stopped || SimulationTime == 0 ||
          (SimulationTime - lastResultCollection) >= ResultCollectionInterval) {
-        //UpdateVisualization();   
+        UpdateVisualization();   
         if (Analyzer != null) {
           Analyzer.Analyze(this, Scenario, Results);
@@ -426 +413 @@
       simulationObject = new SimulationObject();
       lastResultCollection = 0;
+      simulationTime = 0;
       newSimulationTime = 0;
 
@@ -453 +441 @@
       base.OnPrepared();
       PrepareOptimization();
+      simulationTime = 0;
       newSimulationTime = 0;
     }
@@ -461 +450 @@
       InitWaitHandle();
 
-      if (!Results.ContainsKey("SimulationTime")) {
+      if (simulationTime == 0) {
         PrepareOptimization();
         CreateSimulation();