X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8fba529aba8e352c57974ff6b111808d087d3a0..f0534a5e2af72c36c12d55f7ea323040e6e9bf36:/src/mc/transition/TransitionAny.cpp diff --git a/src/mc/transition/TransitionAny.cpp b/src/mc/transition/TransitionAny.cpp index a80a800c12..220b7cb501 100644 --- a/src/mc/transition/TransitionAny.cpp +++ b/src/mc/transition/TransitionAny.cpp @@ -7,10 +7,6 @@ #include "simgrid/config.h" #include "xbt/asserts.h" #include "xbt/string.hpp" -#if SIMGRID_HAVE_MC -#include "src/mc/api/RemoteApp.hpp" -#include "src/mc/api/State.hpp" -#endif #include @@ -41,6 +37,10 @@ std::string TestAnyTransition::to_string(bool verbose) const } bool TestAnyTransition::depends(const Transition* other) const { + // Actions executed by the same actor are always dependent + if (other->aid_ == aid_) + return true; + return transitions_[times_considered_]->depends(other); } WaitAnyTransition::WaitAnyTransition(aid_t issuer, int times_considered, std::stringstream& stream) @@ -63,6 +63,9 @@ std::string WaitAnyTransition::to_string(bool verbose) const } bool WaitAnyTransition::depends(const Transition* other) const { + // Actions executed by the same actor are always dependent + if (other->aid_ == aid_) + return true; return transitions_[times_considered_]->depends(other); }