X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/863d7ae03c294566165effc8a6eff7fed7cb3e9f..ca3f81bbdb29e514038a035ae1e3d222a5c7d6b5:/src/kernel/lmm/fair_bottleneck.cpp

diff --git a/src/kernel/lmm/fair_bottleneck.cpp b/src/kernel/lmm/fair_bottleneck.cpp
index 71de3e7559..c368001621 100644
--- a/src/kernel/lmm/fair_bottleneck.cpp
+++ b/src/kernel/lmm/fair_bottleneck.cpp
@@ -24,7 +24,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     return;
 
   XBT_DEBUG("Variable set : %zu", sys->variable_set.size());
-  for (s_lmm_variable_t& var : sys->variable_set) {
+  for (Variable& var : sys->variable_set) {
     var.value = 0.0;
     XBT_DEBUG("Handling variable %p", &var);
     if (var.sharing_weight > 0.0 && std::find_if(begin(var.cnsts), end(var.cnsts), [](s_lmm_element_t const& x) {
@@ -39,10 +39,10 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
   }
 
   XBT_DEBUG("Active constraints : %zu", sys->active_constraint_set.size());
-  for (s_lmm_constraint_t& cnst : sys->active_constraint_set) {
+  for (Constraint& cnst : sys->active_constraint_set) {
     sys->saturated_constraint_set.push_back(cnst);
   }
-  for (s_lmm_constraint_t& cnst : sys->saturated_constraint_set) {
+  for (Constraint& cnst : sys->saturated_constraint_set) {
     cnst.remaining = cnst.bound;
     cnst.usage     = 0.0;
   }
@@ -61,7 +61,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
     XBT_DEBUG("******* Constraints to process: %zu *******", cnst_list.size());
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
-      s_lmm_constraint_t& cnst = *iter;
+      Constraint& cnst = *iter;
       int nb = 0;
       XBT_DEBUG("Processing cnst %p ", &cnst);
       cnst.usage = 0.0;
@@ -85,7 +85,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
 
     for (auto iter = std::begin(var_list); iter != std::end(var_list);) {
-      s_lmm_variable_t& var = *iter;
+      Variable& var  = *iter;
       double min_inc = DBL_MAX;
       for (s_lmm_element_t const& elm : var.cnsts) {
         if (elm.consumption_weight > 0)
@@ -103,7 +103,7 @@ void simgrid::kernel::lmm::bottleneck_solve(lmm_system_t sys)
     }
 
     for (auto iter = std::begin(cnst_list); iter != std::end(cnst_list);) {
-      s_lmm_constraint_t& cnst = *iter;
+      Constraint& cnst = *iter;
       XBT_DEBUG("Updating cnst %p ", &cnst);
       if (cnst.sharing_policy) {
         for (s_lmm_element_t& elem : cnst.enabled_element_set) {