Observer to receive data throughout the simulation. #14

Author: caduandrade

CHANGELOG.md

@@ -4,6 +4,7 @@
 * Added
   * `runState` getter to determine whether the simulation has not started, is running, or has completed.
   * `stop` method to manually stop the simulation before it completes.
+  * Observer to receive data throughout the simulation.
 
 ## 0.2.0
 

README.md

@@ -9,8 +9,6 @@
 It is designed to model and simulate systems where events occur at discrete points in time,
 allowing for the analysis of complex processes and workflows.
 
-Explore and learn more by clicking [here](https://simdart.github.io/simdart-demo/).
-
 ## Why Dart?
 
 [Dart](https://dart.dev/) was chosen for this project due to its fast execution, single-threaded nature, and ease of use.
@@ -125,7 +123,7 @@ import 'package:simdart/simdart.dart';
 void main() async {
   final SimDart sim = SimDart();
 
-  sim.resources.limited(id: 'resource', capacity: 1);
+  sim.resources.limited(name: 'resource', capacity: 1);
 
   sim.process(event: _eventResource, name: 'A');
   sim.process(event: _eventResource, name: 'B');

example/example.dart

@@ -1,13 +1,12 @@
 import 'package:simdart/simdart.dart';
 
 void main() async {
-  final SimDart sim = SimDart(includeTracks: true);
+  final SimDart sim = SimDart(observer: ConsoleEventObserver());
 
   sim.process(event: _eventA, name: 'A');
 
   SimResult result = await sim.run();
 
-  result.tracks?.forEach((track) => print(track));
   print('startTime: ${result.startTime}');
   print('duration: ${result.duration}');
 }

lib/simdart.dart

@@ -1,9 +1,10 @@
 export 'src/event.dart';
 export 'src/interval.dart';
 export 'src/observable.dart';
+export 'src/sim_observer.dart';
+export 'src/event_phase.dart';
 export 'src/resources.dart' hide ResourcesFactory, ResourceStore;
 export 'src/simdart.dart' hide SimDartHelper;
-export 'src/simulation_track.dart';
 export 'src/start_time_handling.dart';
 export 'src/sim_result.dart';
 export 'src/sim_num.dart';

lib/src/event_phase.dart

@@ -0,0 +1,21 @@
+/// Enum representing the possible event phases.
+///
+/// This enumeration is used to track and distinguish different event status
+/// during the lifecycle of the simulation.
+enum EventPhase {
+  /// The event was called for the first time.
+  called,
+
+  /// The event was resumed after being paused.
+  resumed,
+
+  yielded,
+
+  finished;
+
+  /// Returns the string representation of the status.
+  @override
+  String toString() {
+    return name;
+  }
+}

lib/src/internal/completer_action.dart

@@ -12,4 +12,7 @@ class CompleterAction extends TimeAction {
   void execute() {
     complete.call();
   }
+
+  @override
+  void dispose() {}
 }

lib/src/internal/event_action.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 import 'package:simdart/src/event.dart';
+import 'package:simdart/src/event_phase.dart';
 import 'package:simdart/src/internal/completer_action.dart';
 import 'package:simdart/src/internal/time_action.dart';
 import 'package:simdart/src/interval.dart';
@@ -10,7 +11,6 @@ import 'package:simdart/src/sim_context.dart';
 import 'package:simdart/src/sim_counter.dart';
 import 'package:simdart/src/sim_num.dart';
 import 'package:simdart/src/simdart.dart';
-import 'package:simdart/src/simulation_track.dart';
 
 @internal
 class EventAction extends TimeAction implements SimContext {
@@ -52,10 +52,11 @@ class EventAction extends TimeAction implements SimContext {
       throw StateError('This event is yielding');
     }
 
-    if (sim.includeTracks) {
-      SimDartHelper.addSimulationTrack(
-          sim: sim, eventName: eventName, status: Status.called);
-    }
+    sim.observer?.onEvent(
+        name: eventName,
+        time: sim.now,
+        phase: EventPhase.called,
+        executionHash: hashCode);
 
     _runEvent().then((_) {
       if (_eventCompleter != null) {
@@ -65,7 +66,15 @@ class EventAction extends TimeAction implements SimContext {
                 "Next event is being scheduled, but the current one is still paused waiting for continuation. Did you forget to use 'await'?");
         return;
       }
+      sim.observer?.onEvent(
+          name: eventName,
+          time: sim.now,
+          phase: EventPhase.finished,
+          executionHash: hashCode);
+
       SimDartHelper.scheduleNextAction(sim: sim);
+    }).catchError((e) {
+      // Sim already marked to finish. Let the last event finalize.
     });
   }
 
@@ -82,10 +91,12 @@ class EventAction extends TimeAction implements SimContext {
       return;
     }
 
-    if (sim.includeTracks) {
-      SimDartHelper.addSimulationTrack(
-          sim: sim, eventName: eventName, status: Status.yielded);
-    }
+    sim.observer?.onEvent(
+        name: eventName,
+        time: sim.now,
+        phase: EventPhase.yielded,
+        executionHash: hashCode);
+
     _eventCompleter = EventCompleter(event: this);
 
     // Schedule a complete to resume this event in the future.
@@ -131,6 +142,11 @@ class EventAction extends TimeAction implements SimContext {
   SimNum num(String name) {
     return sim.num(name);
   }
+
+  @override
+  void dispose() {
+    _eventCompleter?.complete();
+  }
 }
 
 class EventCompleter {
@@ -143,10 +159,11 @@ class EventCompleter {
   Future<void> get future => _completer.future;
 
   void complete() {
-    if (event.sim.includeTracks) {
-      SimDartHelper.addSimulationTrack(
-          sim: event.sim, eventName: event.eventName, status: Status.resumed);
-    }
+    event.sim.observer?.onEvent(
+        name: event.eventName,
+        time: event.sim.now,
+        phase: EventPhase.resumed,
+        executionHash: hashCode);
     _completer.complete();
     event._eventCompleter = null;
   }

lib/src/internal/repeat_event_action.dart

@@ -45,4 +45,7 @@ class RepeatEventAction extends TimeAction {
     }
     SimDartHelper.scheduleNextAction(sim: sim);
   }
+
+  @override
+  void dispose() {}
 }

lib/src/internal/time_action.dart

@@ -14,4 +14,6 @@ abstract class TimeAction {
   final int order;
 
   void execute();
+
+  void dispose();
 }

lib/src/resources.dart

@@ -1,10 +1,10 @@
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
+import 'package:simdart/src/event_phase.dart';
 import 'package:simdart/src/internal/completer_action.dart';
 import 'package:simdart/src/internal/event_action.dart';
 import 'package:simdart/src/simdart.dart';
-import 'package:simdart/src/simulation_track.dart';
 
 @internal
 class ResourceStore {
@@ -163,10 +163,11 @@ class ResourcesContext extends Resources {
     if (resource != null) {
       bool acquired = resource.acquire(_event);
       if (!acquired) {
-        if (_sim.includeTracks) {
-          SimDartHelper.addSimulationTrack(
-              sim: _sim, eventName: _event.eventName, status: Status.yielded);
-        }
+        _sim.observer?.onEvent(
+            name: _event.eventName,
+            time: _sim.now,
+            phase: EventPhase.yielded,
+            executionHash: _event.hashCode);
         _event.buildCompleter();
         resource._waiting.add(_event);
         SimDartHelper.scheduleNextAction(sim: _sim);