virtual ~Model();
- /** @brief Get the set of [actions](@ref Action) in *ready* state */
- Action::StateSet* get_ready_action_set() const { return ready_action_set_; }
+ /** @brief Get the set of [actions](@ref Action) in *inited* state */
+ Action::StateSet* get_inited_action_set() const { return inited_action_set_; }
- /** @brief Get the set of [actions](@ref Action) in *running* state */
- Action::StateSet* get_running_action_set() const { return running_action_set_; }
+ /** @brief Get the set of [actions](@ref Action) in *started* state */
+ Action::StateSet* get_started_action_set() const { return started_action_set_; }
/** @brief Get the set of [actions](@ref Action) in *failed* state */
Action::StateSet* get_failed_action_set() const { return failed_action_set_; }
- /** @brief Get the set of [actions](@ref Action) in *done* state */
- Action::StateSet* get_done_action_set() const { return done_action_set_; }
+ /** @brief Get the set of [actions](@ref Action) in *finished* state */
+ Action::StateSet* get_finished_action_set() const { return finished_action_set_; }
+
+ /** @brief Get the set of [actions](@ref Action) in *ignored* state */
+ Action::StateSet* get_ignored_action_set() const { return ignored_action_set_; }
/** @brief Get the set of modified [actions](@ref Action) */
Action::ModifiedSet* get_modified_set() const;
UpdateAlgo get_update_algorithm() const { return update_algorithm_; }
/** @brief Get Action heap */
- heap_type& get_action_heap() { return action_heap_; }
-
- double actionHeapTopDate() const { return action_heap_.top().first; }
- Action* actionHeapPop();
- bool actionHeapIsEmpty() const { return action_heap_.empty(); }
+ ActionHeap& get_action_heap() { return action_heap_; }
/**
* @brief Share the resources between the actions
virtual void update_actions_state_lazy(double now, double delta);
virtual void update_actions_state_full(double now, double delta);
- /** @brief Returns whether this model have an idempotent shareResource()
+ /** @brief Returns whether this model have an idempotent share_resource()
*
* 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 nextOccuringEventIsIdempotent() { return true; }
+ virtual bool next_occuring_event_is_idempotent() { return true; }
private:
lmm::System* maxmin_system_ = nullptr;
const UpdateAlgo update_algorithm_;
- 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 */
- Action::StateSet* done_action_set_ = new Action::StateSet(); /**< Actions in state SURF_ACTION_DONE */
- heap_type action_heap_;
+ Action::StateSet* inited_action_set_ = new Action::StateSet(); /**< Created not started */
+ Action::StateSet* started_action_set_ = new Action::StateSet(); /**< Started not done */
+ Action::StateSet* failed_action_set_ = new Action::StateSet(); /**< Done with failure */
+ Action::StateSet* finished_action_set_ = new Action::StateSet(); /**< Done successful */
+ Action::StateSet* ignored_action_set_ = new Action::StateSet(); /**< not considered (failure detectors?) */
+
+ ActionHeap action_heap_;
};
} // namespace resource