Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
reindent.
[simgrid.git] / src / surf / fair_bottleneck.c
index 34a7329..443981b 100644 (file)
@@ -56,28 +56,31 @@ void bottleneck_solve(lmm_system_t sys)
   /* 
    * Compute Usage and store the variables that reach the maximum.
    */
-  while(1){
+  while (1) {
     DEBUG1("Constraints to process: %d", xbt_swag_size(cnst_list));
     xbt_swag_foreach_safe(cnst, cnst_next, cnst_list) {
       int nb = 0;
       elem_list = &(cnst->element_set);
       cnst->usage = 0.0;
       xbt_swag_foreach(elem, elem_list) {
-       if(elem->variable->weight <=0) break;
+       if (elem->variable->weight <= 0)
+         break;
        if ((elem->value > 0)) {
          nb++;
-         if(cnst->usage>0)
-           cnst->usage = MIN(cnst->usage, elem->value / elem->variable->weight);
-         else 
+         if (cnst->usage > 0)
+           cnst->usage =
+               MIN(cnst->usage, elem->value / elem->variable->weight);
+         else
            cnst->usage = elem->value / elem->variable->weight;
-       } 
-       DEBUG2("Constraint Usage %p : %f",cnst,cnst->usage);
-       //      make_elem_active(elem);
+       }
+       DEBUG2("Constraint Usage %p : %f", cnst, cnst->usage);
+       //      make_elem_active(elem);
       }
-      if(!cnst->shared) nb=1;
+      if (!cnst->shared)
+       nb = 1;
       cnst->usage = cnst->usage * nb;
       /* Saturated constraints update */
-      if(min_usage<0 || min_usage > cnst->remaining / cnst->usage) {
+      if (min_usage < 0 || min_usage > cnst->remaining / cnst->usage) {
        min_usage = cnst->remaining / cnst->usage;
        while ((useless_cnst = xbt_swag_extract(&(cnst_to_update)))) {
          xbt_swag_insert_at_head(useless_cnst, cnst_list);
@@ -89,42 +92,45 @@ void bottleneck_solve(lmm_system_t sys)
        xbt_swag_insert(cnst, &(cnst_to_update));
       }
     }
-    
-    if(!xbt_swag_size(&cnst_to_update)) break;
-    
-    while((cnst = xbt_swag_extract(&cnst_to_update))) {
+
+    if (!xbt_swag_size(&cnst_to_update))
+      break;
+
+    while ((cnst = xbt_swag_extract(&cnst_to_update))) {
       int nb = 0;
       xbt_swag_foreach(elem, elem_list) {
-       if(elem->variable->weight <=0) break;
-       if ((elem->value > 0)) nb++;
+       if (elem->variable->weight <= 0)
+         break;
+       if ((elem->value > 0))
+         nb++;
       }
-      if(!cnst->shared) nb=1;
+      if (!cnst->shared)
+       nb = 1;
 
       xbt_swag_foreach(elem, elem_list) {
-       var=elem->variable;
-       if(var->weight <=0) break;
-       if(var->value == 0.0) {
+       var = elem->variable;
+       if (var->weight <= 0)
+         break;
+       if (var->value == 0.0) {
          int i;
-         var->value = cnst->remaining / nb * var->weight /
-           elem->value;
-         
+         var->value = cnst->remaining / nb * var->weight / elem->value;
+
          /* Update usage */
-         
+
          for (i = 0; i < var->cnsts_number; i++) {
            lmm_element_t elm = &var->cnsts[i];
            cnst = elm->constraint;
-             double_update(&(cnst->remaining), elm->value * var->value);
-             double_update(&(cnst->usage), elm->value / var->weight);
-             //              make_elem_inactive(elm);
-           } 
+           double_update(&(cnst->remaining), elm->value * var->value);
+           double_update(&(cnst->usage), elm->value / var->weight);
+           //              make_elem_inactive(elm);
          }
        }
+      }
     }
-  } 
+  }
 
   sys->modified = 0;
-  if(XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
+  if (XBT_LOG_ISENABLED(surf_maxmin, xbt_log_priority_debug)) {
     lmm_print(sys);
   }
 }
-