New implementation for bandwidth factors

[simgrid.git] / src / kernel / resource / Model.cpp

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index e9cf922..905ac2d 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -12,6 +12,10 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
+Model::Model(const std::string& name) : name_(name)
+{
+}
+
 Model::~Model() =
     default; // Don't move this declaration to the header, or it will break external projects such as SimGrid-FMI
 
@@ -64,7 +68,7 @@ double Model::next_occurring_event_lazy(double now)
     action->update_remains_lazy(now);
 
     double min   = -1;
-    double share = action->get_variable()->get_value();
+    double share = action->get_rate();
 
     if (share > 0) {
       double time_to_completion;
@@ -113,7 +117,7 @@ double Model::next_occurring_event_full(double /*now*/)
   double min = -1;
 
   for (Action& action : *get_started_action_set()) {
-    double value = action.get_variable()->get_value();
+    double value = action.get_rate();
     if (value > 0) {
       if (action.get_remains() > 0)
         value = action.get_remains_no_update() / value;
@@ -176,12 +180,6 @@ void Model::update_actions_state_full(double /*now*/, double /*delta*/)
   THROW_UNIMPLEMENTED;
 }
 
-Model* Model::set_name(const std::string& name)
-{
-  name_ = name;
-  return this;
-}
-
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid