Changeset 10454 for branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/DiscreteEventSimulation.cs

Timestamp:

02/13/14 17:28:30 (10 years ago)

Author:

abeham

Message:

#1610: updated core, implemented card game sample

File:

• branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/DiscreteEventSimulation.cs (modified) (6 diffs)

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/DiscreteEventSimulation.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using HeuristicLab.Common;
@@ -32 +33 @@
     }
 
+    [StorableConstructor]
+    protected DiscreteEventSimulation(bool deserializing) : base(deserializing) { }
     protected DiscreteEventSimulation(DiscreteEventSimulation<TModel> original, Cloner cloner)
       : base(original, cloner) {
@@ -39 +42 @@
       Model = cloner.Clone(original.Model);
     }
-
     protected DiscreteEventSimulation() {
       Parameters.Add(new FixedValueParameter<DoubleValue>("MaximumTime", "The simulation stops after reaching this time.", new DoubleValue(1000)));
+    }
+
+    protected override void OnPrepared() {
+      base.OnPrepared();
+      if (CompositeEventQueue != null)
+        CompositeEventQueue.Clear();
     }
 
@@ -47 +55 @@
       CompositeEventQueue = new CompositeEventQueue<TModel>(Activities.Select(x => x.EventQueue));
 
-      var actionMonitor = new Dictionary<Guid, List<IActivity<TModel>>>();
+      var log = new StringBuilder();
+
+      var actionMonitor = new Dictionary<Type, List<IActivity<TModel>>>();
       foreach (var activity in Activities) {
-        foreach (var actionId in activity.MonitoredActionIds) {
+        foreach (var actionId in activity.MonitoredActions) {
           if (!actionMonitor.ContainsKey(actionId)) actionMonitor[actionId] = new List<IActivity<TModel>>();
           actionMonitor[actionId].Add(activity);
@@ -55 +65 @@
       }
 
-      if (InitialAction != null) {
+      if (CompositeEventQueue.Empty && InitialAction != null) {
         InitialAction.Execute(Model);
         CallActivities(actionMonitor, InitialAction);
@@ -62 +72 @@
       while (!CompositeEventQueue.Empty && Model.CurrentTime < MaximumTime) {
         var @event = CompositeEventQueue.Pop();
+        if (@event.Time < Model.CurrentTime) continue;
+        log.AppendLine(@event.Action.GetType().Name);
+        Model.CurrentTime = @event.Time;
+
         var nextEvent = CompositeEventQueue.Empty ? null : CompositeEventQueue.Peek();
         var action = @event.Action;
 
         action.Execute(Model);
-        CallActivities(actionMonitor, action);
 
-        if (@event.Time > Model.CurrentTime && (nextEvent == null || @event.Time < nextEvent.Time)) {
-          var timeUpdateAction = new ModelTimeUpdateAction<TModel>(null, @event.Time);
-          timeUpdateAction.Execute(Model);
-
-          if (actionMonitor.ContainsKey(timeUpdateAction.ActionId))
-            foreach (var activity in actionMonitor[timeUpdateAction.ActionId])
-              activity.ManageEvents(Model, timeUpdateAction);
-
+        if (nextEvent == null || @event.Time < nextEvent.Time) {
           foreach (var reporter in Reporters)
             reporter.UpdateReporting(Model, Results);
         }
+
+        CallActivities(actionMonitor, action);
+
         cancellationToken.ThrowIfCancellationRequested();
       };
     }
 
-    private void CallActivities(Dictionary<Guid, List<IActivity<TModel>>> actionMonitor, IAction<TModel> action) {
-      if (actionMonitor.ContainsKey(action.ActionId)) {
-        foreach (var activity in actionMonitor[action.ActionId])
+    private void CallActivities(Dictionary<Type, List<IActivity<TModel>>> actionMonitor, IAction<TModel> action) {
+      if (actionMonitor.ContainsKey(action.GetType())) {
+        foreach (var activity in actionMonitor[action.GetType()])
+          activity.ManageEvents(Model, action);
+      }
+
+      if (actionMonitor.ContainsKey(typeof(object))) {
+        foreach (var activity in actionMonitor[typeof(object)])
           activity.ManageEvents(Model, action);
       }