Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of https://framagit.org/simgrid/simgrid
authormlaurent <mathieu.laurent@ens-rennes.fr>
Mon, 20 Feb 2023 09:41:27 +0000 (10:41 +0100)
committermlaurent <mathieu.laurent@ens-rennes.fr>
Mon, 20 Feb 2023 09:41:27 +0000 (10:41 +0100)
1  2 
src/mc/api/ActorState.hpp
src/mc/api/State.cpp
src/mc/api/State.hpp
src/mc/mc_config.cpp

Simple merge
@@@ -65,22 -29,9 +63,19 @@@ std::size_t State::count_todo() cons
    return boost::range::count_if(this->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
  }
  
 +void State::mark_all_todo() 
 +{
 +    for (auto & [aid, actor] : actors_to_run_) {
 +
 +      if (actor.is_enabled() and not actor.is_done() and not actor.is_todo())
 +          actor.mark_todo();
 +      
 +    }
 +}
 +    
  Transition* State::get_transition() const
  {
-     if (transition_ == nullptr) {
-         return default_transition.get();
-     }
-     return transition_;
+   return transition_;
  }
  
  aid_t State::next_transition() const
Simple merge
Simple merge