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 b37c3b811264ac6e0488c942b446c16c6ae43389..905ac2dcef54adc5b0326febdddf60f8a4ffcb41 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -68,7 +68,7 @@ double Model::next_occurring_event_lazy(double now)
     action->update_remains_lazy(now);
 
     double min   = -1;
     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;
 
     if (share > 0) {
       double time_to_completion;


@@ -117,7 +117,7 @@ double Model::next_occurring_event_full(double /*now*/)
   double min = -1;
 
   for (Action& action : *get_started_action_set()) {
   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;
     if (value > 0) {
       if (action.get_remains() > 0)
         value = action.get_remains_no_update() / value;