Solve white space conflicts

[simgrid.git] / src / surf / maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 349093c..9598be2 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -126,7 +126,7 @@ static XBT_INLINE void lmm_cnst_free(lmm_system_t sys,
                                      lmm_constraint_t cnst)
 {
 /*   xbt_assert(xbt_swag_size(&(cnst->element_set)), */
-/*           "This list should be empty!"); */
+/*         "This list should be empty!"); */
   make_constraint_inactive(sys, cnst);
   free(cnst);
 }
@@ -227,7 +227,8 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
     xbt_swag_insert_at_head(var, &(sys->variable_set));
   else
     xbt_swag_insert_at_tail(var, &(sys->variable_set));
-  XBT_OUT();
+
+  XBT_OUT(" returns %p", var);
   return var;
 }
 
@@ -266,11 +267,14 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
     xbt_swag_insert_at_head(elem, &(elem->constraint->element_set));
   else
     xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
-
-  make_constraint_active(sys, cnst);
-  lmm_update_modified_set(sys, cnst);
-  if (var->cnsts_number > 1)
-    lmm_update_modified_set(sys, var->cnsts[0].constraint);
+  if(!sys->selective_update_active) {
+    make_constraint_active(sys, cnst);
+  } else if(elem->value>0 || var->weight >0) {
+    make_constraint_active(sys, cnst);
+    lmm_update_modified_set(sys, cnst);
+    if (var->cnsts_number > 1)
+      lmm_update_modified_set(sys, var->cnsts[0].constraint);
+  }
 }
 
 void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
@@ -361,11 +365,11 @@ XBT_INLINE void *lmm_variable_id(lmm_variable_t var)
 }
 
 static XBT_INLINE int saturated_constraint_set_update(lmm_system_t sys,
-                                                       lmm_constraint_t
-                                                       cnst,
-                                                       double *min_usage)
+                                                      lmm_constraint_t
+                                                      cnst,
+                                                      double *min_usage)
 {
-  lmm_constraint_t useless_cnst = NULL;
+  volatile double usage;
 
   XBT_IN("sys=%p, cnst=%p, min_usage=%f", sys, cnst, *min_usage);
   if (cnst->usage <= 0) {
@@ -376,18 +380,15 @@ static XBT_INLINE int saturated_constraint_set_update(lmm_system_t sys,
     XBT_OUT();
     return 1;
   }
-  if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
-    *min_usage = cnst->remaining / cnst->usage;
-    XBT_LOG(xbt_log_priority_trace,
-         "min_usage=%f (cnst->remaining=%f, cnst->usage=%f)", *min_usage,
-         cnst->remaining, cnst->usage);
-    while ((useless_cnst =
-            xbt_swag_getFirst(&(sys->saturated_constraint_set))))
-      xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
-
-    xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
-  } else if (*min_usage == cnst->remaining / cnst->usage) {
-    xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
+  usage = cnst->remaining / cnst->usage;
+  if (*min_usage < 0 || *min_usage > usage) {
+    *min_usage = usage;
+    XBT_HERE(" min_usage=%f (cnst->remaining=%f, cnst->usage=%f)",
+             *min_usage, cnst->remaining, cnst->usage);
+    xbt_swag_reset(&sys->saturated_constraint_set);
+    xbt_swag_insert(cnst, &sys->saturated_constraint_set);
+  } else if (*min_usage == usage) {
+    xbt_swag_insert(cnst, &sys->saturated_constraint_set);
   }
   XBT_OUT();
   return 0;
@@ -457,7 +458,7 @@ void lmm_print(lmm_system_t sys)
     sprintf(print_buf, "%s(",(cnst->shared)?"":"max");
     trace_buf =
       xbt_realloc(trace_buf,
-                 strlen(trace_buf) + strlen(print_buf) + 1);
+      strlen(trace_buf) + strlen(print_buf) + 1);
     strcat(trace_buf, print_buf);      
     xbt_swag_foreach(elem, elem_list) {
       sprintf(print_buf, "%f.'%d'(%f) %s ", elem->value,
@@ -467,9 +468,9 @@ void lmm_print(lmm_system_t sys)
                       strlen(trace_buf) + strlen(print_buf) + 1);
       strcat(trace_buf, print_buf);
       if(cnst->shared) 
-       sum += elem->value * elem->variable->value;
+  sum += elem->value * elem->variable->value;
       else 
-       sum = MAX(sum,elem->value * elem->variable->value);
+  sum = MAX(sum,elem->value * elem->variable->value);
     }
     sprintf(print_buf, "0) <= %f ('%d')", cnst->bound, cnst->id_int);
     trace_buf =
@@ -570,11 +571,21 @@ void lmm_solve(lmm_system_t sys)
     XBT_DEBUG("Constraint Usage '%d' : %f", cnst->id_int, cnst->usage);
     /* Saturated constraints update */
     if(cnst->usage>0) {
+      // TODO Créer une contrainte light
+      // À partir de maintenant, usage et remaining sont dans cnst_light uniquement.
+      // En fait, usage et remaining doivent disparaitre complètement de cnst pour n'être que dans cnst_light.
       xbt_swag_remove(cnst, cnst_list);
       xbt_swag_insert_at_head(cnst, cnst_list);
     }
+    // On a deux dynars:
+    //    - Celui de cnst_list avec les csnt_light
+    //    - saturated_constraint_set, celui des indexes de cnst_list qui sont saturées
+    // Si la cnst_light est un minimum_usage on la met dans saturated_constraint_set
     saturated_constraint_set_update(sys, cnst, &min_usage);
   }
+  // On parcours saturated_constraint_set (le tableau d'index) dans le sens décroissant
+  //   - on accède aux contraintes correspondantes pour mettre les variables dans saturated_variable_set
+  //   - on se permutte si besoin avec le dernier élément; on enlève le dernier élément de cnst_list
   saturated_variable_set_update(sys);
 
   /* Saturated variables update */