X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7566d16ce01e9c1a081e3312f598b5b025375f9d..3d6a650d3eca402e8f725595d9671954705c3f50:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index bdee4b2d60..3e9b4a4d5b 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -86,7 +86,6 @@ static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
 {
 
   lmm_variable_disable(sys, var);
-  memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
   free(var->cnsts);
   xbt_mallocator_release(sys->variable_mallocator, var);
 }
@@ -325,7 +324,7 @@ static void saturated_variable_set_update(lmm_system_t sys)
   }
 }
 
-static void lmm_print(lmm_system_t sys)
+void lmm_print(lmm_system_t sys)
 {
   lmm_constraint_t cnst = NULL;
   lmm_element_t elem = NULL;
@@ -363,7 +362,7 @@ static void lmm_print(lmm_system_t sys)
     strcat(trace_buf, print_buf);
     xbt_swag_foreach(elem, elem_list) {
       sprintf(print_buf,"%f.'%p'(%f) + ",elem->value, 
-	      elem->variable,elem->variable->weight);
+	      elem->variable,elem->variable->value);
       trace_buf = xbt_realloc(trace_buf,strlen(trace_buf)+strlen(print_buf)+1);
       strcat(trace_buf, print_buf);
       sum += elem->value * elem->variable->value;
@@ -371,6 +370,12 @@ static void lmm_print(lmm_system_t sys)
     sprintf(print_buf,"0 <= %f ('%p')",cnst->bound,cnst);
     trace_buf = 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);
+      strcat(trace_buf, print_buf);
+    }
     DEBUG1("%s",trace_buf);
     trace_buf[0]='\000';
     xbt_assert2((sum<=cnst->bound), "Incorrect value (%f is not smaller than %f)",
@@ -410,9 +415,9 @@ void lmm_solve(lmm_system_t sys)
     var->value = 0.0;
   }
 
-
-  /* Compute Usage and store the variables that reach the maximum */
-
+  /* 
+   * Compute Usage and store the variables that reach the maximum.
+   */
   cnst_list = &(sys->active_constraint_set);
   DEBUG1("Active constraints : %d", xbt_swag_size(cnst_list));
   xbt_swag_foreach(cnst, cnst_list) {
@@ -420,21 +425,22 @@ void lmm_solve(lmm_system_t sys)
     cnst->remaining = cnst->bound;
     cnst->usage = 0;
     elem_list = &(cnst->element_set);
+    cnst->usage = 0.0;
     xbt_swag_foreach(elem, elem_list) {
       if(elem->variable->weight <=0) break;
       if ((elem->value > 0)) {
 	if(cnst->shared)
 	  cnst->usage += elem->value / elem->variable->weight;
 	else 
-	  cnst->usage = 1;
+	  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 */
     saturated_constraint_set_update(sys, cnst, &min_usage);
   }
-
   saturated_variable_set_update(sys);
 
   /* Saturated variables update */
@@ -459,6 +465,8 @@ void lmm_solve(lmm_system_t sys)
       int i;
 
       var->value = min_usage / var->weight;
+      DEBUG5("Min usage: %f, Var(%p)->weight: %f, Var(%p)->value: %f ",min_usage,var,var->weight,var,var->value);
+
 
       /* Update usage */
 
@@ -466,10 +474,23 @@ void lmm_solve(lmm_system_t sys)
 	elem = &var->cnsts[i];
 	cnst = elem->constraint;
 	if(cnst->shared) {
-	  cnst->remaining -= elem->value * var->value;
-	  cnst->usage -= elem->value / var->weight;
+	  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);
+	    }
+	  } 
 	}
-	make_elem_inactive(elem);
       }
       xbt_swag_remove(var, var_list);
     }