X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e48eade5ab404acd1948883302768c55be145b6a..ce354758f86f0fad1ea536f1cbc0a337267b9987:/src/mc/api/State.hpp diff --git a/src/mc/api/State.hpp b/src/mc/api/State.hpp index 83a2f0714a..36e7138498 100644 --- a/src/mc/api/State.hpp +++ b/src/mc/api/State.hpp @@ -8,7 +8,7 @@ #include "src/mc/api/ActorState.hpp" #include "src/mc/api/RemoteApp.hpp" -#include "src/mc/api/guide/GuidedState.hpp" +#include "src/mc/api/strategy/Strategy.hpp" #include "src/mc/sosp/Snapshot.hpp" #include "src/mc/transition/Transition.hpp" @@ -46,7 +46,7 @@ class XBT_PRIVATE State : public xbt::Extendable { and for guided model-checking */ std::shared_ptr parent_state_ = nullptr; - std::shared_ptr guide_; + std::shared_ptr strategy_; /* Sleep sets are composed of the actor and the corresponding transition that made it being added to the sleep * set. With this information, it is check whether it should be removed from it or not when exploring a new @@ -75,20 +75,20 @@ public: * + consider_one mark aid actor (and assert it is possible) * + consider_best ensure one actor is marked by eventually marking the best regarding its guiding methode * + conside_all mark all enabled actor that are not done yet */ - void consider_one(aid_t aid) { guide_->consider_one(aid); } - void consider_best() { guide_->consider_best(); } - unsigned long consider_all() { return guide_->consider_all(); } + void consider_one(aid_t aid) { strategy_->consider_one(aid); } + void consider_best() { strategy_->consider_best(); } + unsigned long consider_all() { return strategy_->consider_all(); } - bool is_actor_done(aid_t actor) const { return guide_->actors_to_run_.at(actor).is_done(); } + bool is_actor_done(aid_t actor) const { return strategy_->actors_to_run_.at(actor).is_done(); } Transition* get_transition() const; void set_transition(Transition* t) { transition_ = t; } std::shared_ptr get_parent_state() { return parent_state_; } std::list get_recipe() const { return recipe_; } - std::map const& get_actors_list() const { return guide_->actors_to_run_; } + std::map const& get_actors_list() const { return strategy_->actors_to_run_; } - unsigned long get_actor_count() const { return guide_->actors_to_run_.size(); } - bool is_actor_enabled(aid_t actor) { return guide_->actors_to_run_.at(actor).is_enabled(); } + unsigned long get_actor_count() const { return strategy_->actors_to_run_.size(); } + bool is_actor_enabled(aid_t actor) { return strategy_->actors_to_run_.at(actor).is_enabled(); } Snapshot* get_system_state() const { return system_state_.get(); } void set_system_state(std::shared_ptr state) { system_state_ = std::move(state); }