X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90b0fa923c841996f89a17c252a443a65493fbfc..3b56ba0e1914362b1c7e6b7d84bf72e2fe88f3c2:/src/mc/transition/TransitionAny.cpp diff --git a/src/mc/transition/TransitionAny.cpp b/src/mc/transition/TransitionAny.cpp index 1335153726..4813a00ff8 100644 --- a/src/mc/transition/TransitionAny.cpp +++ b/src/mc/transition/TransitionAny.cpp @@ -1,23 +1,18 @@ -/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/mc/transition/TransitionAny.hpp" +#include "simgrid/config.h" #include "xbt/asserts.h" -#include -#if SIMGRID_HAVE_MC -#include "src/mc/ModelChecker.hpp" -#include "src/mc/Session.hpp" -#include "src/mc/api/State.hpp" -#endif +#include "xbt/string.hpp" #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_trans_any, mc_transition, "Logging specific to MC WaitAny / TestAny transitions"); -namespace simgrid { -namespace mc { +namespace simgrid::mc { TestAnyTransition::TestAnyTransition(aid_t issuer, int times_considered, std::stringstream& stream) : Transition(Type::TESTANY, issuer, times_considered) @@ -32,10 +27,10 @@ TestAnyTransition::TestAnyTransition(aid_t issuer, int times_considered, std::st } std::string TestAnyTransition::to_string(bool verbose) const { - auto res = xbt::string_printf("%ld: TestAny{ ", aid_); + auto res = xbt::string_printf("TestAny{ "); for (auto const* t : transitions_) res += t->to_string(verbose); - res += "}"; + res += " }"; return res; } bool TestAnyTransition::depends(const Transition* other) const @@ -54,10 +49,10 @@ WaitAnyTransition::WaitAnyTransition(aid_t issuer, int times_considered, std::st } std::string WaitAnyTransition::to_string(bool verbose) const { - auto res = xbt::string_printf("%ld: WaitAny{ ", aid_); + auto res = xbt::string_printf("WaitAny{ "); for (auto const* t : transitions_) res += t->to_string(verbose); - res += "}"; + res += " }"; return res; } bool WaitAnyTransition::depends(const Transition* other) const @@ -65,5 +60,4 @@ bool WaitAnyTransition::depends(const Transition* other) const return transitions_[times_considered_]->depends(other); } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc