X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49f13b7915f6632e0a99d1b916b700049094a59d..4a6c8108ddea55a6c199759bac3bd4f8ca4daf2c:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index b0d4d98bb1..daf878be70 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -323,11 +323,9 @@ public: * @param now The current time of the simulation * @return The delta of time till the next action will finish */ - virtual double next_occuring_event(double now); - virtual double next_occuring_event_lazy(double now); - virtual double next_occuring_event_full(double now); - double shareResourcesMaxMin(ActionList* running_actions, - lmm_system_t sys, void (*solve) (lmm_system_t)); + virtual double nextOccuringEvent(double now); + virtual double nextOccuringEventLazy(double now); + virtual double nextOccuringEventFull(double now); /** * @brief Update action to the current time @@ -344,13 +342,13 @@ public: * The only model that is not is NS3: computing the next timestamp moves the model up to that point, * so we need to call it only when the next timestamp of other sources is computed. */ - virtual bool next_occuring_event_isIdempotent()=0; + virtual bool nextOccuringEventIsIdempotent() { return true;} protected: ActionLmmListPtr modifiedSet_; lmm_system_t maxminSystem_ = nullptr; e_UM_t updateMechanism_ = UM_UNDEFINED; - int selectiveUpdate_; + bool selectiveUpdate_; xbt_heap_t actionHeap_; private: