X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/999c6ca0248ff66351ef2ebd0901622384212bc6..c3119f83962a5b1ef7bc8f79011698c83ce21cda:/src/surf/maxmin.cpp

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index 0f156e3709..f6dfe9a836 100644
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,9 +10,11 @@
 #include "xbt/mallocator.h"
 #include "xbt/sysdep.h"
 #include <cxxabi.h>
+#include <limits>
 #include <math.h>
 #include <stdio.h> /* sprintf */
 #include <stdlib.h>
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
 
 typedef struct s_dyn_light {
@@ -48,7 +49,7 @@ static void lmm_check_concurrency(lmm_system_t sys);
 
 inline int lmm_element_concurrency(lmm_element_t elem) {
   //Ignore element with weight less than one (e.g. cross-traffic)
-  return (elem->value>=1)?1:0;
+  return (elem->consumption_weight >= 1) ? 1 : 0;
   //There are other alternatives, but they will change the behaviour of the model..
   //So do not use it unless you want to make a new model.
   //If you do, remember to change the variables concurrency share to reflect it.
@@ -134,7 +135,6 @@ void lmm_system_free(lmm_system_t sys)
 static inline void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var)
 {
   int i;
-  int nelements;
 
   lmm_element_t elem = nullptr;
 
@@ -148,14 +148,14 @@ static inline void lmm_variable_remove(lmm_system_t sys, lmm_variable_t var)
 
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
-    if(var->weight>0)
-    lmm_decrease_concurrency(elem);
+    if (var->sharing_weight > 0)
+      lmm_decrease_concurrency(elem);
     xbt_swag_remove(elem, &(elem->constraint->enabled_element_set));
     xbt_swag_remove(elem, &(elem->constraint->disabled_element_set));
     xbt_swag_remove(elem, &(elem->constraint->active_element_set));
-    nelements=xbt_swag_size(&(elem->constraint->enabled_element_set)) +
-              xbt_swag_size(&(elem->constraint->disabled_element_set));
-    if (not nelements)
+    int nelements = xbt_swag_size(&(elem->constraint->enabled_element_set)) +
+                    xbt_swag_size(&(elem->constraint->disabled_element_set));
+    if (nelements == 0)
       make_constraint_inactive(sys, elem->constraint);
     else
       lmm_on_disabled_var(sys,elem->constraint);
@@ -247,9 +247,9 @@ int lmm_constraint_sharing_policy(lmm_constraint_t cnst)
   return (cnst->sharing_policy);
 }
 
-/* @brief Remove a constraint 
+/* @brief Remove a constraint
  * Currently this is dead code, but it is exposed in maxmin.h
- * Apparently, this call was designed assuming that constraint would no more have elements in it. 
+ * Apparently, this call was designed assuming that constraint would no more have elements in it.
  * If not the case, assertion will fail, and you need to add calls e.g. to lmm_shrink before effectively removing it.
  */
 inline void lmm_constraint_free(lmm_system_t sys,lmm_constraint_t cnst)
@@ -275,13 +275,13 @@ static void lmm_variable_mallocator_free_f(void *var)
   xbt_free(var);
 }
 
-lmm_variable_t lmm_variable_new(lmm_system_t sys, simgrid::surf::Action* id, double weight, double bound,
+lmm_variable_t lmm_variable_new(lmm_system_t sys, simgrid::surf::Action* id, double sharing_weight, double bound,
                                 int number_of_constraints)
 {
   lmm_variable_t var = nullptr;
   int i;
 
-  XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", sys, id, weight, bound, number_of_constraints);
+  XBT_IN("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)", sys, id, sharing_weight, bound, number_of_constraints);
 
   var = (lmm_variable_t) xbt_mallocator_get(sys->variable_mallocator);
   var->id = id;
@@ -296,11 +296,11 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, simgrid::surf::Action* id, dou
     var->cnsts[i].active_element_set_hookup.prev = nullptr;
     var->cnsts[i].constraint = nullptr;
     var->cnsts[i].variable = nullptr;
-    var->cnsts[i].value = 0.0;
+    var->cnsts[i].consumption_weight               = 0.0;
   }
   var->cnsts_size = number_of_constraints;
   var->cnsts_number = 0;
-  var->weight = weight;
+  var->sharing_weight    = sharing_weight;
   var->staged_weight = 0.0;
   var->bound = bound;
   var->concurrency_share = 1;
@@ -317,7 +317,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, simgrid::surf::Action* id, dou
   var->saturated_variable_set_hookup.next = nullptr;
   var->saturated_variable_set_hookup.prev = nullptr;
 
-  if (weight)
+  if (sharing_weight)
     xbt_swag_insert_at_head(var, &(sys->variable_set));
   else
     xbt_swag_insert_at_tail(var, &(sys->variable_set));
@@ -368,7 +368,8 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
 
   sys->modified = 1;
 
-  XBT_DEBUG("remove elem(value %f, cnst %p, var %p) in var %p", elem->value, elem->constraint, elem->variable, var);
+  XBT_DEBUG("remove elem(value %f, cnst %p, var %p) in var %p", elem->consumption_weight, elem->constraint,
+            elem->variable, var);
 
   /* We are going to change the constraint object and the variable object.
    * Propagate this change to other objects. Calling here before removing variable from not active elements
@@ -385,7 +386,7 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
   xbt_swag_remove(elem, &(elem->constraint->active_element_set));
   elem->constraint = nullptr;
   elem->variable = nullptr;
-  elem->value = 0;
+  elem->consumption_weight = 0;
 
   var->cnsts_number -= 1;
 
@@ -394,16 +395,15 @@ void lmm_shrink(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var)
     make_constraint_inactive(sys, cnst);
   else {
     //Check maxconcurrency to see if we can enable new variables
-    lmm_on_disabled_var(sys,elem->constraint);       
+    lmm_on_disabled_var(sys,elem->constraint);
   }
 
   lmm_check_concurrency(sys);
 }
 
-void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value)
+void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double consumption_weight)
 {
   lmm_element_t elem = nullptr;
-  double weight;
   int i,current_share;
 
   sys->modified = 1;
@@ -419,26 +419,26 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, dou
     }
   }
 
-  //Check if we need to disable the variable 
-  if(var->weight>0 && var->concurrency_share-current_share>lmm_concurrency_slack(cnst)) {
-    weight=var->weight;
+  //Check if we need to disable the variable
+  if (var->sharing_weight > 0 && var->concurrency_share - current_share > lmm_concurrency_slack(cnst)) {
+    double weight = var->sharing_weight;
     lmm_disable_var(sys,var);
     for (i = 0; i < var->cnsts_number; i++)
       lmm_on_disabled_var(sys,var->cnsts[i].constraint);
-    value=0;
+    consumption_weight = 0;
     var->staged_weight=weight;
-    xbt_assert(not var->weight);
+    xbt_assert(not var->sharing_weight);
   }
 
   xbt_assert(var->cnsts_number < var->cnsts_size, "Too much constraints");
 
   elem = &(var->cnsts[var->cnsts_number++]);
 
-  elem->value = value;
+  elem->consumption_weight = consumption_weight;
   elem->constraint = cnst;
   elem->variable = var;
 
-  if (var->weight){
+  if (var->sharing_weight) {
     xbt_swag_insert_at_head(elem, &(elem->constraint->enabled_element_set));
     lmm_increase_concurrency(elem);
   } else
@@ -446,7 +446,7 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, dou
 
   if (not sys->selective_update_active) {
     make_constraint_active(sys, cnst);
-  } else if(elem->value>0 || var->weight >0) {
+  } else if (elem->consumption_weight > 0 || var->sharing_weight > 0) {
     make_constraint_active(sys, cnst);
     lmm_update_modified_set(sys, cnst);
     //TODOLATER: Why do we need this second call?
@@ -459,7 +459,7 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, dou
 
 void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var, double value)
 {
-  int i,j;
+  int i;
   double weight;
   sys->modified = 1;
 
@@ -471,23 +471,23 @@ void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst, lmm_variable_t var,
       break;
 
   if (i < var->cnsts_number) {
-    if (var->weight)
+    if (var->sharing_weight)
       lmm_decrease_concurrency(&var->cnsts[i]);
 
     if (cnst->sharing_policy)
-      var->cnsts[i].value += value;
+      var->cnsts[i].consumption_weight += value;
     else
-      var->cnsts[i].value = MAX(var->cnsts[i].value, value);
+      var->cnsts[i].consumption_weight = MAX(var->cnsts[i].consumption_weight, value);
 
     //We need to check that increasing value of the element does not cross the concurrency limit
-    if (var->weight){
+    if (var->sharing_weight) {
       if(lmm_concurrency_slack(cnst)<lmm_element_concurrency(&var->cnsts[i])){
-        weight=var->weight;
+        weight = var->sharing_weight;
         lmm_disable_var(sys,var);
-        for (j = 0; j < var->cnsts_number; j++)
+        for (int j = 0; j < var->cnsts_number; j++)
           lmm_on_disabled_var(sys,var->cnsts[j].constraint);
         var->staged_weight=weight;
-        xbt_assert(not var->weight);
+        xbt_assert(not var->sharing_weight);
       }
       lmm_increase_concurrency(&var->cnsts[i]);
     }
@@ -509,7 +509,7 @@ lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t /*sys*/, lmm_variable_t var,
 double lmm_get_cnst_weight_from_var(lmm_system_t /*sys*/, lmm_variable_t var, int num)
 {
   if (num < var->cnsts_number)
-    return (var->cnsts[num].value);
+    return (var->cnsts[num].consumption_weight);
   else
     return 0.0;
 }
@@ -535,7 +535,7 @@ lmm_variable_t lmm_get_var_from_cnst(lmm_system_t /*sys*/, lmm_constraint_t cnst
       if (*elem == nullptr)
         *elem = (lmm_element_t) xbt_swag_getFirst(&(cnst->disabled_element_set));
     } else {
-      *elem = (lmm_element_t) xbt_swag_getNext(*elem, cnst->disabled_element_set.offset);      
+      *elem = (lmm_element_t) xbt_swag_getNext(*elem, cnst->disabled_element_set.offset);
     }
   }
   if (*elem)
@@ -569,7 +569,7 @@ lmm_variable_t lmm_get_var_from_cnst_safe(lmm_system_t /*sys*/, lmm_constraint_t
       if (*nextelem == nullptr)
         *nextelem = (lmm_element_t) xbt_swag_getFirst(&(cnst->disabled_element_set));
     } else {
-      *nextelem = (lmm_element_t) xbt_swag_getNext(*elem, cnst->disabled_element_set.offset);      
+      *nextelem = (lmm_element_t) xbt_swag_getNext(*elem, cnst->disabled_element_set.offset);
     }
     return (*elem)->variable;
   }else
@@ -610,7 +610,7 @@ static inline void saturated_constraint_set_update(double usage, int cnst_light_
 static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_light_tab,
                                                  dyn_light_t saturated_constraint_set, lmm_system_t sys)
 {
-  /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate (cnst_light_tab)*/ 
+  /* Add active variables (i.e. variables that need to be set) from the set of constraints to saturate (cnst_light_tab)*/
   lmm_constraint_light_t cnst = nullptr;
   void *_elem;
   lmm_element_t elem = nullptr;
@@ -622,8 +622,8 @@ static inline void saturated_variable_set_update(s_lmm_constraint_light_t *cnst_
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
       //Visiting active_element_set, so, by construction, should never get a zero weight, correct?
-      xbt_assert(elem->variable->weight > 0);
-      if ((elem->value > 0))
+      xbt_assert(elem->variable->sharing_weight > 0);
+      if ((elem->consumption_weight > 0))
         xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
     }
   }
@@ -641,13 +641,12 @@ void lmm_print(lmm_system_t sys)
   xbt_swag_t var_list   = nullptr;
   xbt_swag_t elem_list  = nullptr;
   std::string buf       = std::string("MAX-MIN ( ");
-  double sum = 0.0;
 
   /* Printing Objective */
   var_list = &(sys->variable_set);
   xbt_swag_foreach(_var, var_list) {
     var = (lmm_variable_t)_var;
-    buf = buf + "'" + std::to_string(var->id_int) + "'(" + std::to_string(var->weight) + ") ";
+    buf = buf + "'" + std::to_string(var->id_int) + "'(" + std::to_string(var->sharing_weight) + ") ";
   }
   buf += ")";
   XBT_DEBUG("%20s", buf.c_str());
@@ -657,31 +656,31 @@ void lmm_print(lmm_system_t sys)
   /* Printing Constraints */
   cnst_list = &(sys->active_constraint_set);
   xbt_swag_foreach(_cnst, cnst_list) {
-  cnst = (lmm_constraint_t)_cnst;
-    sum = 0.0;
+    cnst       = (lmm_constraint_t)_cnst;
+    double sum = 0.0;
     //Show  the enabled variables
     elem_list = &(cnst->enabled_element_set);
     buf += "\t";
     buf += ((cnst->sharing_policy) ? "(" : "max(");
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
-      buf  = buf + std::to_string(elem->value) + ".'" + std::to_string(elem->variable->id_int) + "'(" +
+      buf  = buf + std::to_string(elem->consumption_weight) + ".'" + std::to_string(elem->variable->id_int) + "'(" +
             std::to_string(elem->variable->value) + ")" + ((cnst->sharing_policy) ? " + " : " , ");
       if(cnst->sharing_policy)
-        sum += elem->value * elem->variable->value;
-      else 
-        sum = MAX(sum,elem->value * elem->variable->value);
+        sum += elem->consumption_weight * elem->variable->value;
+      else
+        sum = MAX(sum, elem->consumption_weight * elem->variable->value);
     }
     //TODO: Adding disabled elements only for test compatibility, but do we really want them to be printed?
     elem_list = &(cnst->disabled_element_set);
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
-      buf  = buf + std::to_string(elem->value) + ".'" + std::to_string(elem->variable->id_int) + "'(" +
+      buf  = buf + std::to_string(elem->consumption_weight) + ".'" + std::to_string(elem->variable->id_int) + "'(" +
             std::to_string(elem->variable->value) + ")" + ((cnst->sharing_policy) ? " + " : " , ");
       if(cnst->sharing_policy)
-        sum += elem->value * elem->variable->value;
-      else 
-        sum = MAX(sum,elem->value * elem->variable->value);
+        sum += elem->consumption_weight * elem->variable->value;
+      else
+        sum = MAX(sum, elem->consumption_weight * elem->variable->value);
     }
 
     buf = buf + "0) <= " + std::to_string(cnst->bound) + " ('" + std::to_string(cnst->id_int) + "')";
@@ -702,11 +701,11 @@ void lmm_print(lmm_system_t sys)
   xbt_swag_foreach(_var, var_list) {
   var = (lmm_variable_t)_var;
     if (var->bound > 0) {
-      XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->weight, var->value, var->bound);
+      XBT_DEBUG("'%d'(%f) : %f (<=%f)", var->id_int, var->sharing_weight, var->value, var->bound);
       xbt_assert(not double_positive(var->value - var->bound, var->bound * sg_maxmin_precision),
                  "Incorrect value (%f is not smaller than %f", var->value, var->bound);
     } else {
-      XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->weight, var->value);
+      XBT_DEBUG("'%d'(%f) : %f", var->id_int, var->sharing_weight, var->value);
     }
   }
 }
@@ -741,7 +740,7 @@ void lmm_solve(lmm_system_t sys)
     //XBT_DEBUG("Variable set : %d", xbt_swag_size(elem_list));
     xbt_swag_foreach(_elem, elem_list) {
       var = ((lmm_element_t)_elem)->variable;
-      xbt_assert(var->weight > 0.0);
+      xbt_assert(var->sharing_weight > 0.0);
       var->value = 0.0;
     }
   }
@@ -764,12 +763,12 @@ void lmm_solve(lmm_system_t sys)
     elem_list = &(cnst->enabled_element_set);
     xbt_swag_foreach(_elem, elem_list) {
       elem = (lmm_element_t)_elem;
-      xbt_assert(elem->variable->weight > 0);
-      if ((elem->value > 0)) {
+      xbt_assert(elem->variable->sharing_weight > 0);
+      if ((elem->consumption_weight > 0)) {
         if (cnst->sharing_policy)
-          cnst->usage += elem->value / elem->variable->weight;
-        else if (cnst->usage < elem->value / elem->variable->weight)
-          cnst->usage = elem->value / elem->variable->weight;
+          cnst->usage += elem->consumption_weight / elem->variable->sharing_weight;
+        else if (cnst->usage < elem->consumption_weight / elem->variable->sharing_weight)
+          cnst->usage = elem->consumption_weight / elem->variable->sharing_weight;
 
         make_elem_active(elem);
         simgrid::surf::Action *action = static_cast<simgrid::surf::Action*>(elem->variable->id);
@@ -801,17 +800,16 @@ void lmm_solve(lmm_system_t sys)
 
     xbt_swag_foreach(_var, var_list) {
       var = (lmm_variable_t)_var;
-      if (var->weight <= 0.0)
+      if (var->sharing_weight <= 0.0)
         DIE_IMPOSSIBLE;
       /* First check if some of these variables could reach their upper bound and update min_bound accordingly. */
-      XBT_DEBUG
-          ("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f",
-           var->id_int, var->bound, var->weight, min_usage, var->bound * var->weight);
-      if ((var->bound > 0) && (var->bound * var->weight < min_usage)) {
+      XBT_DEBUG("var=%d, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f", var->id_int,
+                var->bound, var->sharing_weight, min_usage, var->bound * var->sharing_weight);
+      if ((var->bound > 0) && (var->bound * var->sharing_weight < min_usage)) {
         if (min_bound < 0)
-          min_bound = var->bound*var->weight;
+          min_bound = var->bound * var->sharing_weight;
         else
-          min_bound = MIN(min_bound, (var->bound*var->weight));
+          min_bound = MIN(min_bound, (var->bound * var->sharing_weight));
         XBT_DEBUG("Updated min_bound=%f", min_bound);
       }
     }
@@ -822,14 +820,14 @@ void lmm_solve(lmm_system_t sys)
       if (min_bound < 0) {
         //If no variable could reach its bound, deal iteratively the constraints usage ( at worst one constraint is
         // saturated at each cycle)
-        var->value = min_usage / var->weight;
+        var->value = min_usage / var->sharing_weight;
         // XBT_DEBUG("Setting %p (%d) value to %f\n", var, var->id_int, var->value);
         XBT_DEBUG("Setting var (%d) value to %f\n", var->id_int, var->value);
       } else {
          //If there exist a variable that can reach its bound, only update it (and other with the same bound) for now.
-         if (double_equals(min_bound, var->bound*var->weight, sg_maxmin_precision)){
-            var->value = var->bound;
-            XBT_DEBUG("Setting %p (%d) value to %f\n", var, var->id_int, var->value);
+         if (double_equals(min_bound, var->bound * var->sharing_weight, sg_maxmin_precision)) {
+           var->value = var->bound;
+           XBT_DEBUG("Setting %p (%d) value to %f\n", var, var->id_int, var->value);
          } else {
            // Variables which bound is different are not considered for this cycle, but they will be afterwards.
            XBT_DEBUG("Do not consider %p (%d) \n", var, var->id_int);
@@ -837,8 +835,8 @@ void lmm_solve(lmm_system_t sys)
            continue;
          }
       }
-      XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ",
-                min_usage, var->id_int, var->weight, var->id_int, var->value);
+      XBT_DEBUG("Min usage: %f, Var(%d)->weight: %f, Var(%d)->value: %f ", min_usage, var->id_int, var->sharing_weight,
+                var->id_int, var->value);
 
       /* Update the usage of contraints where this variable is involved */
       for (i = 0; i < var->cnsts_number; i++) {
@@ -846,8 +844,8 @@ void lmm_solve(lmm_system_t sys)
         cnst = elem->constraint;
         if (cnst->sharing_policy) {
           //Remember: shared constraints require that sum(elem->value * var->value) < cnst->bound
-          double_update(&(cnst->remaining),  elem->value * var->value, cnst->bound*sg_maxmin_precision);
-          double_update(&(cnst->usage), elem->value / var->weight, sg_maxmin_precision);
+          double_update(&(cnst->remaining), elem->consumption_weight * var->value, cnst->bound * sg_maxmin_precision);
+          double_update(&(cnst->usage), elem->consumption_weight / var->sharing_weight, sg_maxmin_precision);
           //If the constraint is saturated, remove it from the set of active constraints (light_tab)
           if (not double_positive(cnst->usage, sg_maxmin_precision) ||
               not double_positive(cnst->remaining, cnst->bound * sg_maxmin_precision)) {
@@ -874,10 +872,10 @@ void lmm_solve(lmm_system_t sys)
           elem_list = &(cnst->enabled_element_set);
           xbt_swag_foreach(_elem, elem_list) {
             elem = (lmm_element_t)_elem;
-            xbt_assert(elem->variable->weight > 0);
+            xbt_assert(elem->variable->sharing_weight > 0);
             if (elem->variable->value > 0) continue;
-            if (elem->value > 0)
-              cnst->usage = MAX(cnst->usage, elem->value / elem->variable->weight);
+            if (elem->consumption_weight > 0)
+              cnst->usage = MAX(cnst->usage, elem->consumption_weight / elem->variable->sharing_weight);
           }
           //If the constraint is saturated, remove it from the set of active constraints (light_tab)
           if (not double_positive(cnst->usage, sg_maxmin_precision) ||
@@ -938,11 +936,11 @@ void lmm_solve(lmm_system_t sys)
 }
 
 /** \brief Attribute the value bound to var->bound.
- * 
+ *
  *  \param sys the lmm_system_t
  *  \param var the lmm_variable_t
  *  \param bound the new bound to associate with var
- * 
+ *
  *  Makes var->bound equal to bound. Whenever this function is called a change is  signed in the system. To
  *  avoid false system changing detection it is a good idea to test (bound != 0) before calling it.
  */
@@ -960,16 +958,14 @@ int lmm_concurrency_slack(lmm_constraint_t cnstr){
   if(cnstr->concurrency_limit<0)
     return 666;
 
-  return  cnstr->concurrency_limit - cnstr->concurrency_current;  
+  return  cnstr->concurrency_limit - cnstr->concurrency_current;
 }
 
 /** \brief Measure the minimum concurrency slack across all constraints where the given var is involved */
 int lmm_cnstrs_min_concurrency_slack(lmm_variable_t var){
-  int i;
-  //FIXME MARTIN: Replace by infinite value std::numeric_limits<int>::(max)(), or something better within Simgrid?
-  int slack,minslack=666;
-  for (i = 0; i < var->cnsts_number; i++) {
-    slack=lmm_concurrency_slack(var->cnsts[i].constraint);
+  int minslack = std::numeric_limits<int>::max();
+  for (int i = 0; i < var->cnsts_number; i++) {
+    int slack = lmm_concurrency_slack(var->cnsts[i].constraint);
 
     //This is only an optimization, to avoid looking at more constraints when slack is already zero
     //Disable it when debugging to let lmm_concurrency_slack catch nasty things
@@ -985,7 +981,7 @@ int lmm_cnstrs_min_concurrency_slack(lmm_variable_t var){
 
 /* /Check if a variable can be enabled
  *
- * Make sure to set staged_weight before, if your intent is only to check concurrency 
+ * Make sure to set staged_weight before, if your intent is only to check concurrency
  */
 int lmm_can_enable_var(lmm_variable_t var){
   return var->staged_weight>0 && lmm_cnstrs_min_concurrency_slack(var)>=var->concurrency_share;
@@ -1001,7 +997,7 @@ void lmm_enable_var(lmm_system_t sys, lmm_variable_t var){
 
   xbt_assert(lmm_can_enable_var(var));
 
-  var->weight = var->staged_weight;
+  var->sharing_weight = var->staged_weight;
   var->staged_weight = 0;
 
   //Enabling the variable, move to var to list head. Subtility is: here, we need to call lmm_update_modified_set AFTER
@@ -1020,7 +1016,7 @@ void lmm_enable_var(lmm_system_t sys, lmm_variable_t var){
 
   //When used within lmm_on_disabled_var, we would get an assertion fail, because transiently there can be variables
   // that are staged and could be activated.
-  //Anyway, caller functions all call lmm_check_concurrency() in the end. 
+  //Anyway, caller functions all call lmm_check_concurrency() in the end.
   //  lmm_check_concurrency(sys);
 }
 
@@ -1045,14 +1041,14 @@ void lmm_disable_var(lmm_system_t sys, lmm_variable_t var){
     lmm_decrease_concurrency(elem);
   }
 
-  var->weight=0.0;
+  var->sharing_weight = 0.0;
   var->staged_weight=0.0;
   var->value = 0.0;
   lmm_check_concurrency(sys);
 }
- 
+
 /* /brief Find variables that can be enabled and enable them.
- * 
+ *
  * Assuming that the variable has already been removed from non-zero weights
  * Can we find a staged variable to add?
  * If yes, check that none of the constraints that this variable is involved in is at the limit of its concurrency
@@ -1092,7 +1088,7 @@ void lmm_on_disabled_var(lmm_system_t sys, lmm_constraint_t cnstr){
 
   //We could get an assertion fail, because transiently there can be variables that are staged and could be activated.
   //And we need to go through all constraints of the disabled var before getting back a coherent state.
-  //Anyway, caller functions all call lmm_check_concurrency() in the end. 
+  //Anyway, caller functions all call lmm_check_concurrency() in the end.
   //  lmm_check_concurrency(sys);
 }
 
@@ -1104,11 +1100,11 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double wei
 
   xbt_assert(weight>=0,"Variable weight should not be negative!");
 
-  if (weight == var->weight)
+  if (weight == var->sharing_weight)
     return;
 
-  int enabling_var=  (weight>0 && var->weight<=0);
-  int disabling_var= (weight<=0 && var->weight>0);
+  int enabling_var  = (weight > 0 && var->sharing_weight <= 0);
+  int disabling_var = (weight <= 0 && var->sharing_weight > 0);
 
   XBT_IN("(sys=%p, var=%p, weight=%f)", sys, var, weight);
 
@@ -1129,7 +1125,7 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double wei
     //Are we disabling this variable?
     lmm_disable_var(sys,var);
   } else {
-    var->weight=weight;
+    var->sharing_weight = weight;
   }
 
   lmm_check_concurrency(sys);
@@ -1139,7 +1135,7 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, double wei
 
 double lmm_get_variable_weight(lmm_variable_t var)
 {
-  return var->weight;
+  return var->sharing_weight;
 }
 
 void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst, double bound)
@@ -1188,7 +1184,7 @@ static void lmm_update_modified_set_rec(lmm_system_t sys, lmm_constraint_t cnst)
         lmm_update_modified_set_rec(sys, cnsts[i].constraint);
       }
     }
-    //var will be ignored in later visits as long as sys->visited_counter does not move 
+    //var will be ignored in later visits as long as sys->visited_counter does not move
     var->visited = sys->visited_counter;
   }
 }
@@ -1218,7 +1214,7 @@ static void lmm_remove_all_modified_set(lmm_system_t sys)
   void *_var;
     xbt_swag_foreach(_var, &sys->variable_set)
       ((lmm_variable_t)_var)->visited = 0;
-  } 
+  }
   xbt_swag_reset(&sys->modified_constraint_set);
 }
 
@@ -1240,39 +1236,47 @@ double lmm_constraint_get_usage(lmm_constraint_t cnst) {
 
    xbt_swag_foreach(_elem, elem_list) {
      lmm_element_t elem = (lmm_element_t)_elem;
-     if (elem->value > 0) {
+     if (elem->consumption_weight > 0) {
        if (cnst->sharing_policy)
-         usage += elem->value * elem->variable->value;
-       else if (usage < elem->value * elem->variable->value)
-         usage = std::max(usage, elem->value * elem->variable->value);
+         usage += elem->consumption_weight * elem->variable->value;
+       else if (usage < elem->consumption_weight * elem->variable->value)
+         usage = std::max(usage, elem->consumption_weight * elem->variable->value);
      }
    }
   return usage;
 }
+int lmm_constraint_get_variable_amount(lmm_constraint_t cnst) {
+  int usage = 0;
+  xbt_swag_t elem_list = &(cnst->enabled_element_set);
+  void *_elem;
 
-void lmm_check_concurrency(lmm_system_t sys){
-  void* _cnst;
-  void* _elem;
-  void* _var;
-  lmm_element_t elem;
-  lmm_constraint_t cnst;
-  lmm_variable_t var;
-  int concurrency;
-  int i,belong_to_enabled,belong_to_disabled,belong_to_active;
+  xbt_swag_foreach(_elem, elem_list) {
+    lmm_element_t elem = (lmm_element_t)_elem;
+    if (elem->consumption_weight > 0)
+      usage++;
+  }
+ return usage;
+}
 
+void lmm_check_concurrency(lmm_system_t sys){
   //These checks are very expensive, so do them only if we want to debug SURF LMM
   if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
-    xbt_swag_foreach(_cnst, &(sys->constraint_set)) {
-      cnst = (lmm_constraint_t) _cnst;
-      concurrency=0;
-      xbt_swag_foreach(_elem, &(cnst->enabled_element_set)) {
-        elem = (lmm_element_t)_elem;
-        xbt_assert(elem->variable->weight > 0);
+    void* cnstIt;
+    xbt_swag_foreach(cnstIt, &(sys->constraint_set))
+    {
+      lmm_constraint_t cnst = (lmm_constraint_t)cnstIt;
+      int concurrency       = 0;
+      void* elemIt;
+      xbt_swag_foreach(elemIt, &(cnst->enabled_element_set))
+      {
+        lmm_element_t elem = (lmm_element_t)elemIt;
+        xbt_assert(elem->variable->sharing_weight > 0);
         concurrency+=lmm_element_concurrency(elem);
       }
 
-      xbt_swag_foreach(_elem, &(cnst->disabled_element_set)) {
-        elem = (lmm_element_t)_elem;
+      xbt_swag_foreach(elemIt, &(cnst->disabled_element_set))
+      {
+        lmm_element_t elem = (lmm_element_t)elemIt;
         //We should have staged variables only if concurrency is reached in some constraint
         xbt_assert(cnst->concurrency_limit<0 || elem->variable->staged_weight==0 ||
                    lmm_cnstrs_min_concurrency_slack(elem->variable) < elem->variable->concurrency_share,
@@ -1284,18 +1288,20 @@ void lmm_check_concurrency(lmm_system_t sys){
     }
 
     //Check that for each variable, all corresponding elements are in the same state (i.e. same element sets)
-    xbt_swag_foreach(_var, &(sys->variable_set)) {
-      var= (lmm_variable_t) _var;
+    void* varIt;
+    xbt_swag_foreach(varIt, &(sys->variable_set))
+    {
+      lmm_variable_t var = (lmm_variable_t)varIt;
 
       if (not var->cnsts_number)
         continue;
 
-      elem = &var->cnsts[0];
-      belong_to_enabled=xbt_swag_belongs(elem,&(elem->constraint->enabled_element_set));
-      belong_to_disabled=xbt_swag_belongs(elem,&(elem->constraint->disabled_element_set));
-      belong_to_active=xbt_swag_belongs(elem,&(elem->constraint->active_element_set));
+      lmm_element_t elem     = &var->cnsts[0];
+      int belong_to_enabled  = xbt_swag_belongs(elem, &(elem->constraint->enabled_element_set));
+      int belong_to_disabled = xbt_swag_belongs(elem, &(elem->constraint->disabled_element_set));
+      int belong_to_active   = xbt_swag_belongs(elem, &(elem->constraint->active_element_set));
 
-      for (i = 1; i < var->cnsts_number; i++) {
+      for (int i = 1; i < var->cnsts_number; i++) {
         elem = &var->cnsts[i];
         xbt_assert(belong_to_enabled==xbt_swag_belongs(elem,&(elem->constraint->enabled_element_set)),
                    "Variable inconsistency (1): enabled_element_set");