From: Martin Quinson Date: Wed, 28 Mar 2018 08:14:47 +0000 (+0200) Subject: forgot to rename this one X-Git-Tag: v3.20~592 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ef006f9b04cf2f6cddd617d130f364cf27e47ebd forgot to rename this one --- diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index 1e1bebba44..77039234ed 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -20,12 +20,12 @@ class XBT_PUBLIC Model { public: /** @brief Possible update mechanisms */ enum class UpdateAlgo { - Full, /**< Full update mechanism: the remaining time of every action is recomputed at each step */ - Lazy, /**< Lazy update mechanism: only the modified actions get recomputed. - It may be slower than full if your system is tightly coupled to the point where every action - gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for - a simple full update. */ - UM_UNDEFINED /**< Mechanism not defined */ + Full, /**< Full update mechanism: the remaining time of every action is recomputed at each step */ + Lazy, /**< Lazy update mechanism: only the modified actions get recomputed. + It may be slower than full if your system is tightly coupled to the point where every action + gets recomputed anyway. In that case, you'd better not try to be cleaver with lazy and go for + a simple full update. */ + Undefined /**< Mechanism not defined */ }; Model(); @@ -95,7 +95,7 @@ public: private: lmm::System* maxmin_system_ = nullptr; - UpdateAlgo update_mechanism_ = UpdateAlgo::UM_UNDEFINED; + UpdateAlgo update_mechanism_ = UpdateAlgo::Undefined; Action::StateSet* ready_action_set_ = new Action::StateSet(); /**< Actions in state SURF_ACTION_READY */ Action::StateSet* running_action_set_ = new Action::StateSet(); /**< Actions in state SURF_ACTION_RUNNING */ Action::StateSet* failed_action_set_ = new Action::StateSet(); /**< Actions in state SURF_ACTION_FAILED */