X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95d328f9ca4dd6ccd2065c6c84aca83d43001804..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 37c7f5e9da..26a77b12d8 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -11,10 +11,10 @@
 #include "xbt/mallocator.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
-#include <stdio.h> /* sprintf */
+#include <stdio.h>              /* sprintf */
 #include <math.h>
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf,
-				"Logging specific to SURF (maxmin)");
+                                "Logging specific to SURF (maxmin)");
 
 static void *lmm_variable_mallocator_new_f(void);
 static void lmm_variable_mallocator_free_f(void *var);
@@ -30,22 +30,22 @@ lmm_system_t lmm_system_new(void)
 
   l->modified = 0;
   xbt_swag_init(&(l->variable_set),
-		xbt_swag_offset(var, variable_set_hookup));
+                xbt_swag_offset(var, variable_set_hookup));
   xbt_swag_init(&(l->constraint_set),
-		xbt_swag_offset(cnst, constraint_set_hookup));
+                xbt_swag_offset(cnst, constraint_set_hookup));
 
   xbt_swag_init(&(l->active_constraint_set),
-		xbt_swag_offset(cnst, active_constraint_set_hookup));
+                xbt_swag_offset(cnst, active_constraint_set_hookup));
 
   xbt_swag_init(&(l->saturated_variable_set),
-		xbt_swag_offset(var, saturated_variable_set_hookup));
+                xbt_swag_offset(var, saturated_variable_set_hookup));
   xbt_swag_init(&(l->saturated_constraint_set),
-		xbt_swag_offset(cnst, saturated_constraint_set_hookup));
+                xbt_swag_offset(cnst, saturated_constraint_set_hookup));
 
   l->variable_mallocator = xbt_mallocator_new(64,
-					      lmm_variable_mallocator_new_f,
-					      lmm_variable_mallocator_free_f,
-					      lmm_variable_mallocator_reset_f);
+                                              lmm_variable_mallocator_new_f,
+                                              lmm_variable_mallocator_free_f,
+                                              lmm_variable_mallocator_reset_f);
 
   return l;
 }
@@ -101,7 +101,7 @@ static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
-				    double bound_value)
+                                    double bound_value)
 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;
@@ -109,9 +109,9 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   cnst = xbt_new0(s_lmm_constraint_t, 1);
   cnst->id = id;
   xbt_swag_init(&(cnst->element_set),
-		xbt_swag_offset(elem, element_set_hookup));
+                xbt_swag_offset(elem, element_set_hookup));
   xbt_swag_init(&(cnst->active_element_set),
-		xbt_swag_offset(elem, active_element_set_hookup));
+                xbt_swag_offset(elem, active_element_set_hookup));
 
   cnst->bound = bound_value;
   cnst->usage = 0;
@@ -154,14 +154,14 @@ static void lmm_variable_mallocator_reset_f(void *var)
 }
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
-				double weight,
-				double bound, int number_of_constraints)
+                                double weight,
+                                double bound, int number_of_constraints)
 {
   lmm_variable_t var = NULL;
   int i;
 
   XBT_IN5("(sys=%p, id=%p, weight=%f, bound=%f, num_cons =%d)",
-	  sys, id, weight, bound, number_of_constraints);
+          sys, id, weight, bound, number_of_constraints);
 
   var = xbt_mallocator_get(sys->variable_mallocator);
   var->id = id;
@@ -178,8 +178,8 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
     var->cnsts[i].value = 0.0;
   }
   var->cnsts_size = number_of_constraints;
-  var->cnsts_number = 0;	/* Should be useless because of the 
-				   calloc but it seems to help valgrind... */
+  var->cnsts_number = 0;        /* Should be useless because of the 
+                                   calloc but it seems to help valgrind... */
   var->weight = weight;
   var->bound = bound;
   var->value = 0.0;
@@ -214,7 +214,7 @@ double lmm_variable_getbound(lmm_variable_t var)
 }
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, double value)
+                lmm_variable_t var, double value)
 {
   lmm_element_t elem = NULL;
 
@@ -237,7 +237,7 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
 }
 
 void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
-		    lmm_variable_t var, double value)
+                    lmm_variable_t var, double value)
 {
   int i;
   sys->modified = 1;
@@ -247,14 +247,16 @@ void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
       break;
 
   if (i < var->cnsts_number) {
-    if(cnst->shared) var->cnsts[i].value += value;
-    else var->cnsts[i].value = MAX(var->cnsts[i].value,value);
-  }  else
+    if (cnst->shared)
+      var->cnsts[i].value += value;
+    else
+      var->cnsts[i].value = MAX(var->cnsts[i].value, value);
+  } else
     lmm_expand(sys, cnst, var, value);
 }
 
 void lmm_elem_set_value(lmm_system_t sys, lmm_constraint_t cnst,
-			lmm_variable_t var, double value)
+                        lmm_variable_t var, double value)
 {
   int i;
 
@@ -270,7 +272,7 @@ void lmm_elem_set_value(lmm_system_t sys, lmm_constraint_t cnst,
 }
 
 lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
-				       lmm_variable_t var, int num)
+                                       lmm_variable_t var, int num)
 {
   if (num < var->cnsts_number)
     return (var->cnsts[num].constraint);
@@ -284,16 +286,16 @@ int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
 }
 
 lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
-				     lmm_constraint_t cnst,
-				     lmm_element_t * elem)
+                                     lmm_constraint_t cnst,
+                                     lmm_element_t * elem)
 {
   if (!(*elem))
     *elem = xbt_swag_getFirst(&(cnst->element_set));
   else
     *elem = xbt_swag_getNext(*elem, cnst->element_set.offset);
-  if(*elem)
+  if (*elem)
     return (*elem)->variable;
-  else 
+  else
     return NULL;
 }
 
@@ -308,8 +310,8 @@ void *lmm_variable_id(lmm_variable_t var)
 }
 
 static void 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;
 
@@ -325,10 +327,10 @@ static void saturated_constraint_set_update(lmm_system_t sys,
   if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
     *min_usage = cnst->remaining / cnst->usage;
     LOG3(xbt_log_priority_trace,
-	 "min_usage=%f (cnst->remaining=%f, cnst->usage=%f)", *min_usage,
-	 cnst->remaining, cnst->usage);
+         "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_getFirst(&(sys->saturated_constraint_set))))
       xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
 
     xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
@@ -350,9 +352,9 @@ static void saturated_variable_set_update(lmm_system_t sys)
     elem_list = &(cnst->active_element_set);
     xbt_swag_foreach(elem, elem_list) {
       if (elem->variable->weight <= 0)
-	break;
+        break;
       if ((elem->value > 0))
-	xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+        xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
     }
     xbt_swag_remove(cnst, cnst_list);
   }
@@ -374,17 +376,17 @@ void lmm_print(lmm_system_t sys)
   var_list = &(sys->variable_set);
   sprintf(print_buf, "MAX-MIN ( ");
   trace_buf =
-      xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
+    xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
   strcat(trace_buf, print_buf);
   xbt_swag_foreach(var, var_list) {
     sprintf(print_buf, "'%p'(%f) ", var, var->weight);
     trace_buf =
-	xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
+      xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
     strcat(trace_buf, print_buf);
   }
   sprintf(print_buf, ")");
   trace_buf =
-      xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
+    xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
   strcat(trace_buf, print_buf);
   DEBUG1("%s", trace_buf);
   trace_buf[0] = '\000';
@@ -397,34 +399,32 @@ void lmm_print(lmm_system_t sys)
     elem_list = &(cnst->element_set);
     sprintf(print_buf, "\t");
     trace_buf =
-	xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
+      xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
     strcat(trace_buf, print_buf);
     xbt_swag_foreach(elem, elem_list) {
       sprintf(print_buf, "%f.'%p'(%f) + ", elem->value,
-	      elem->variable, elem->variable->value);
+              elem->variable, elem->variable->value);
       trace_buf =
-	  xbt_realloc(trace_buf,
-		      strlen(trace_buf) + strlen(print_buf) + 1);
+        xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
       strcat(trace_buf, print_buf);
       sum += elem->value * elem->variable->value;
     }
     sprintf(print_buf, "0 <= %f ('%p')", cnst->bound, cnst);
     trace_buf =
-	xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
+      xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
     strcat(trace_buf, print_buf);
 
     if (!cnst->shared) {
       sprintf(print_buf, " [MAX-Constraint]");
       trace_buf =
-	  xbt_realloc(trace_buf,
-		      strlen(trace_buf) + strlen(print_buf) + 1);
+        xbt_realloc(trace_buf, strlen(trace_buf) + strlen(print_buf) + 1);
       strcat(trace_buf, print_buf);
     }
     DEBUG1("%s", trace_buf);
     trace_buf[0] = '\000';
     xbt_assert3(!double_positive(sum - cnst->bound),
-		"Incorrect value (%f is not smaller than %f): %g",
-		sum, cnst->bound, sum - cnst->bound);    
+                "Incorrect value (%f is not smaller than %f): %g",
+                sum, cnst->bound, sum - cnst->bound);
   }
 
   DEBUG0("Variables");
@@ -432,10 +432,10 @@ void lmm_print(lmm_system_t sys)
   xbt_swag_foreach(var, var_list) {
     if (var->bound > 0) {
       DEBUG4("'%p'(%f) : %f (<=%f)", var, var->weight, var->value,
-	     var->bound);
+             var->bound);
       xbt_assert2(!double_positive(var->value - var->bound),
-		  "Incorrect value (%f is not smaller than %f",
-		  var->value, var->bound);
+                  "Incorrect value (%f is not smaller than %f",
+                  var->value, var->bound);
     } else
       DEBUG3("'%p'(%f) : %f", var, var->weight, var->value);
   }
@@ -461,14 +461,16 @@ void lmm_solve(lmm_system_t sys)
   var_list = &(sys->variable_set);
   DEBUG1("Variable set : %d", xbt_swag_size(var_list));
   xbt_swag_foreach(var, var_list) {
-    int nb=0;
+    int nb = 0;
     int i;
-    if(var->weight<=0.0) break;
+    if (var->weight <= 0.0)
+      break;
     var->value = 0.0;
     for (i = 0; i < var->cnsts_number; i++) {
-      if(var->cnsts[i].value==0.0) nb++;
+      if (var->cnsts[i].value == 0.0)
+        nb++;
     }
-    if((nb==var->cnsts_number) && (var->weight>0.0))
+    if ((nb == var->cnsts_number) && (var->weight > 0.0))
       var->value = 1.0;
   }
 
@@ -485,14 +487,14 @@ void lmm_solve(lmm_system_t sys)
     cnst->usage = 0.0;
     xbt_swag_foreach(elem, elem_list) {
       if (elem->variable->weight <= 0)
-	break;
+        break;
       if ((elem->value > 0)) {
-	if (cnst->shared)
-	  cnst->usage += elem->value / elem->variable->weight;
-	else if (cnst->usage < elem->value / elem->variable->weight)
-	  cnst->usage = elem->value / elem->variable->weight;
-	DEBUG2("Constraint Usage %p : %f", cnst, cnst->usage);
-	make_elem_active(elem);
+        if (cnst->shared)
+          cnst->usage += elem->value / elem->variable->weight;
+        else if (cnst->usage < elem->value / elem->variable->weight)
+          cnst->usage = elem->value / elem->variable->weight;
+        DEBUG2("Constraint Usage %p : %f", cnst, cnst->usage);
+        make_elem_active(elem);
       }
     }
     /* Saturated constraints update */
@@ -507,19 +509,19 @@ void lmm_solve(lmm_system_t sys)
     var_list = &(sys->saturated_variable_set);
 
     xbt_swag_foreach(var, var_list) {
-      if(var->weight<=0.0) DIE_IMPOSSIBLE;
+      if (var->weight <= 0.0)
+        DIE_IMPOSSIBLE;
       /* First check if some of these variables have reach their upper
          bound and update min_usage accordingly. */
       DEBUG5
-	  ("var=%p, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f",
-	   var, var->bound, var->weight, min_usage,
-	   var->bound * var->weight);
+        ("var=%p, var->bound=%f, var->weight=%f, min_usage=%f, var->bound*var->weight=%f",
+         var, var->bound, var->weight, min_usage, var->bound * var->weight);
       if ((var->bound > 0) && (var->bound * var->weight < min_usage)) {
-	if(min_bound<0)
-	  min_bound = var->bound;
-	else
-	  min_bound = MIN(min_bound,var->bound);
-	DEBUG1("Updated min_bound=%f", min_bound);
+        if (min_bound < 0)
+          min_bound = var->bound;
+        else
+          min_bound = MIN(min_bound, var->bound);
+        DEBUG1("Updated min_bound=%f", min_bound);
       }
     }
 
@@ -527,45 +529,45 @@ void lmm_solve(lmm_system_t sys)
     while ((var = xbt_swag_getFirst(var_list))) {
       int i;
 
-      if(min_bound<0) {
-	var->value = min_usage / var->weight;
+      if (min_bound < 0) {
+        var->value = min_usage / var->weight;
       } else {
-	if(min_bound == var->bound)
-	  var->value = var->bound;
-	else {
-	  xbt_swag_remove(var, var_list);
-	  continue;
-	}
+        if (min_bound == var->bound)
+          var->value = var->bound;
+        else {
+          xbt_swag_remove(var, var_list);
+          continue;
+        }
       }
       DEBUG5("Min usage: %f, Var(%p)->weight: %f, Var(%p)->value: %f ",
-	     min_usage, var, var->weight, var, var->value);
+             min_usage, var, var->weight, var, var->value);
 
 
       /* Update usage */
 
       for (i = 0; i < var->cnsts_number; i++) {
-	elem = &var->cnsts[i];
-	cnst = elem->constraint;
-	if (cnst->shared) {
-	  double_update(&(cnst->remaining), elem->value * var->value);
-	  double_update(&(cnst->usage), elem->value / var->weight);
-	  make_elem_inactive(elem);
-	} else {		/* FIXME one day: We recompute usage.... :( */
-	  cnst->usage = 0.0;
-	  make_elem_inactive(elem);
-	  xbt_swag_foreach(elem, elem_list) {
-	    if (elem->variable->weight <= 0)
-	      break;
-	    if (elem->variable->value > 0)
-	      break;
-	    if ((elem->value > 0)) {
-	      if (cnst->usage < elem->value / elem->variable->weight)
-		cnst->usage = elem->value / elem->variable->weight;
-	      DEBUG2("Constraint Usage %p : %f", cnst, cnst->usage);
-	      make_elem_active(elem);
-	    }
-	  }
-	}
+        elem = &var->cnsts[i];
+        cnst = elem->constraint;
+        if (cnst->shared) {
+          double_update(&(cnst->remaining), elem->value * var->value);
+          double_update(&(cnst->usage), elem->value / var->weight);
+          make_elem_inactive(elem);
+        } else {                /* FIXME one day: We recompute usage.... :( */
+          cnst->usage = 0.0;
+          make_elem_inactive(elem);
+          xbt_swag_foreach(elem, elem_list) {
+            if (elem->variable->weight <= 0)
+              break;
+            if (elem->variable->value > 0)
+              break;
+            if ((elem->value > 0)) {
+              if (cnst->usage < elem->value / elem->variable->weight)
+                cnst->usage = elem->value / elem->variable->weight;
+              DEBUG2("Constraint Usage %p : %f", cnst, cnst->usage);
+              make_elem_active(elem);
+            }
+          }
+        }
       }
       xbt_swag_remove(var, var_list);
     }
@@ -590,7 +592,7 @@ void lmm_solve(lmm_system_t sys)
 /* Not a O(1) function */
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, double value)
+                lmm_variable_t var, double value)
 {
   int i;
 
@@ -615,7 +617,7 @@ void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
  *
  */
 void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
-			       double bound)
+                               double bound)
 {
   sys->modified = 1;
   var->bound = bound;
@@ -623,12 +625,13 @@ void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
 
 
 void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
-				double weight)
+                                double weight)
 {
   int i;
   lmm_element_t elem;
 
-  if(weight==var->weight) return;
+  if (weight == var->weight)
+    return;
   XBT_IN3("(sys=%p, var=%p, weight=%f)", sys, var, weight);
   sys->modified = 1;
   var->weight = weight;
@@ -646,7 +649,7 @@ void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
     else
       xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
   }
-  if(!weight)
+  if (!weight)
     var->value = 0.0;
 
   XBT_OUT;
@@ -658,7 +661,7 @@ double lmm_get_variable_weight(lmm_variable_t var)
 }
 
 void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
-				 double bound)
+                                 double bound)
 {
   sys->modified = 1;
   cnst->bound = bound;
@@ -675,7 +678,7 @@ lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys)
 }
 
 lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys,
-						lmm_constraint_t cnst)
+                                                lmm_constraint_t cnst)
 {
   return xbt_swag_getNext(cnst, (sys->active_constraint_set).offset);
 }