Parcourir la source

Add event data in guard parameter list

Eric Ramat il y a 6 mois
Parent
commit
c9aebf88ae
1 fichiers modifiés avec 7 ajouts et 5 suppressions
  1. 7 5
      src/utils/StateMachine.hpp

+ 7 - 5
src/utils/StateMachine.hpp

@@ -84,7 +84,8 @@ public:
 
     virtual bool event(const typename Time::type & /* t */, int  /* event */) = 0;
 
-    virtual bool guard(const typename Time::type & /* t */) const = 0;
+    virtual bool guard(const typename Time::type & /* t */,
+                       const artis::common::event::Value & /* value */) const = 0;
 
     virtual bool no_event() const = 0;
 
@@ -105,7 +106,8 @@ public:
     bool event(const typename Time::type & /* t */,
                int  /* event */) override { return false; }
 
-    bool guard(const typename Time::type & /* t */) const override { return true; }
+    bool guard(const typename Time::type & /* t */,
+               const artis::common::event::Value & /* value */) const override { return true; }
 
     bool no_event() const override { return false; }
 
@@ -187,7 +189,7 @@ public:
       std::for_each(it->second.cbegin(), it->second.cend(),
                     [t, &unique, &select, &stateID](
                       const std::pair<std::unique_ptr<AbstractTransition>, int> &e) {
-                      if (e.first->no_event() and e.first->guard(t)) {
+                      if (e.first->no_event() and e.first->guard(t, {})) {
                         select = e.first.get();
                         stateID = e.second;
                         ++unique;
@@ -221,7 +223,7 @@ public:
       std::for_each(it->second.cbegin(), it->second.cend(),
                     [t, event, &unique, &select, &stateID](
                       const std::pair<std::unique_ptr<AbstractTransition>, int> &e) {
-                      if (e.first->guard(t) and e.first->event(t, event.id)) {
+                      if (e.first->guard(t, event.data) and e.first->event(t, event.id)) {
                         select = e.first.get();
                         stateID = e.second;
                         ++unique;
@@ -255,7 +257,7 @@ public:
       std::for_each(it->second.cbegin(), it->second.cend(),
                     [t, event, &unique, &select, &stateID](
                       const std::pair<std::unique_ptr<AbstractTransition>, int> &e) {
-                      if (e.first->guard(t) and e.first->event(t, event.id)) {
+                      if (e.first->guard(t, event.data) and e.first->event(t, event.id)) {
                         select = e.first.get();
                         stateID = e.second;
                         ++unique;