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

Timestamp:

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

Author:

abeham

Message:

#1610: updated core, implemented card game sample

Location:

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent

Files:

• Action.cs (modified) (1 diff)
• Activity.cs (modified) (1 diff)
• CompositeEventQueue.cs (modified) (1 diff)
• DiscreteEventSimulation.cs (modified) (6 diffs)
• Event.cs (modified) (1 diff)
• Interfaces/IAction.cs (modified) (1 diff)
• Interfaces/IActivity.cs (modified) (1 diff)
• Interfaces/IEventQueue.cs (modified) (1 diff)
• Model.cs (added)
• ModelTimeUpdateAction.cs (deleted)
• SortedListEventQueue.cs (modified) (1 diff)

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

@@ -6 +6 @@
   [StorableClass]
   public abstract class Action<TModel> : IAction<TModel> where TModel : IModel {
-    public abstract Guid ActionId { get; }
     public IActivity<TModel> Mandate { get; protected set; }
 

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

@@ -15 +15 @@
     }
 
-    public virtual IEnumerable<Guid> MonitoredActionIds {
-      get { return new Guid[0]; }
+    public virtual IEnumerable<Type> MonitoredActions {
+      get { return new Type[0]; }
     }
 

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

@@ -41 +41 @@
     }
 
+    public void Clear() {
+      foreach (var queue in queues) {
+        queue.Clear();
+      }
+    }
+
     [StorableConstructor]
     private CompositeEventQueue(bool deserializing) : base(deserializing) { }

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);
       }

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

@@ -11 +11 @@
 
     #region Storable Properties
-    [Storable]
     // ReSharper disable UnusedMember.Local
     // ReSharper disable UnusedParameter.Local
+    [Storable]
     private double StorableTime {
       get { return time; }

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/Interfaces/IAction.cs

@@ -1 @@
-using System;
-using HeuristicLab.Common;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.SimulationCore {
   public interface IAction<TModel> : IDeepCloneable, IContent where TModel : IModel {
-    Guid ActionId { get; }
     IActivity<TModel> Mandate { get; }
 

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/Interfaces/IActivity.cs

@@ -7 +7 @@
     where TModel : IModel {
     IEventQueue<TModel> EventQueue { get; }
-    IEnumerable<Guid> MonitoredActionIds { get; }
+    IEnumerable<Type> MonitoredActions { get; }
 
     void ManageEvents(TModel model, IAction<TModel> lastAction);

branches/SimulationCore/HeuristicLab.SimulationCore/3.3/DiscreteEvent/Interfaces/IEventQueue.cs

@@ -8 +8 @@
     IEvent<TModel> Peek();
     IEvent<TModel> Pop();
-    void Push(IEvent<TModel> @event);
+    void Push(double time, IAction<TModel> action);
 
     IEvent<TModel> ChangeTime(IEvent<TModel> @event, double newTime);

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

@@ -26 +26 @@
     }
 
-    public void Push(IEvent<TModel> @event) {
-      if (queue.ContainsKey(@event.Time))
-        queue[@event.Time].Add(@event);
-      else queue.Add(@event.Time, new List<IEvent<TModel>>() { @event });
+    public void Push(double time, IAction<TModel> action) {
+      PushEvent(time, action);
+    }
+
+    private IEvent<TModel> PushEvent(double time, IAction<TModel> action) {
+      IEvent<TModel> result = new Event<TModel>(time, action);
+      if (queue.ContainsKey(time))
+        queue[time].Add(result);
+      else queue.Add(time, new List<IEvent<TModel>>() { result });
+      return result;
     }
 
     public IEvent<TModel> ChangeTime(IEvent<TModel> @event, double newTime) {
       Remove(@event);
-      var newEvent = new Event<TModel>(newTime, @event.Action);
-      Push(newEvent);
-      return newEvent;
+      return PushEvent(newTime, @event.Action);
     }