resource:: extract action_heap into its own class

[simgrid.git] / include / simgrid / kernel / resource / Model.hpp

diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
index 8e744df..ad3e0cb 100644 (file)
--- a/include/simgrid/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -20,15 +20,15 @@ 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.  */
   };
 
-  Model();
+  explicit Model(Model::UpdateAlgo algo);
+
   virtual ~Model();
 
   /** @brief Get the set of [actions](@ref Action) in *ready* state */
@@ -49,19 +49,14 @@ public:
   /** @brief Get the maxmin system of the current Model */
   lmm::System* get_maxmin_system() const { return maxmin_system_; }
 
-  /**
-   * @brief Get the update mechanism of the current Model
-   * @see e_UM_t
-   */
-  UpdateAlgo getUpdateMechanism() const { return update_mechanism_; }
-  void setUpdateMechanism(UpdateAlgo mechanism) { update_mechanism_ = mechanism; }
+  /** @brief Set the maxmin system of the current Model */
+  void set_maxmin_system(lmm::System* system) { maxmin_system_ = system; }
 
-  /** @brief Get Action heap */
-  heap_type& getActionHeap() { return action_heap_; }
+  /** @brief Get the update algorithm of the current Model */
+  UpdateAlgo get_update_algorithm() const { return update_algorithm_; }
 
-  double actionHeapTopDate() const { return action_heap_.top().first; }
-  Action* actionHeapPop();
-  bool actionHeapIsEmpty() const { return action_heap_.empty(); }
+  /** @brief Get Action heap */
+  ActionHeap& get_action_heap() { return action_heap_; }
 
   /**
    * @brief Share the resources between the actions
@@ -90,16 +85,14 @@ public:
    */
   virtual bool nextOccuringEventIsIdempotent() { return true; }
 
-protected:
-  lmm::System* maxmin_system_ = nullptr;
-
 private:
-  UpdateAlgo update_mechanism_          = UpdateAlgo::UM_UNDEFINED;
+  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_;
+  ActionHeap action_heap_;
 };
 
 } // namespace resource