X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..2995193b7e30d03c04917852c4c0b26d26646273:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 513ad7a0c1..7d5dbf0e99 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -10,6 +10,8 @@
 #include "xbt/error.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
+				"Logging specific to the SURF maxmin module");
 
 lmm_system_t lmm_system_new(void)
 {
@@ -47,7 +49,7 @@ void lmm_system_free(lmm_system_t sys)
   while ((cnst = extract_constraint(sys)))
     lmm_cnst_free(sys, cnst);
 
-  xbt_free(sys);
+  free(sys);
 }
 
 void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
@@ -60,7 +62,8 @@ void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
     xbt_swag_remove(elem, &(elem->constraint->element_set));
-    if (xbt_swag_size(&(elem->constraint->element_set)))
+    xbt_swag_remove(elem, &(elem->constraint->active_element_set));
+    if (!xbt_swag_size(&(elem->constraint->element_set)))
       make_constraint_inactive(sys, elem->constraint);
   }
   var->cnsts_number = 0;
@@ -70,21 +73,21 @@ static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
 {
 
   lmm_variable_disable(sys, var);
-
-  xbt_free(var->cnsts);
-  xbt_free(var);
+  memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
+  free(var->cnsts);
+  free(var);
 }
 
 static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst)
 {
-/*   xbt_assert0(xbt_fifo_size(&(cnst->row)), */
-/* 		 "This list should be empty!"); */
+/*   xbt_assert0(xbt_swag_size(&(cnst->element_set)), */
+/* 	      "This list should be empty!"); */
   remove_active_constraint(sys, cnst);
-  xbt_free(cnst);
+  free(cnst);
 }
 
 lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
-				    xbt_maxmin_float_t bound_value)
+				    double bound_value)
 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;
@@ -110,9 +113,8 @@ void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
 }
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
-				xbt_maxmin_float_t weight,
-				xbt_maxmin_float_t bound,
-				int number_of_constraints)
+				double weight,
+				double bound, int number_of_constraints)
 {
   lmm_variable_t var = NULL;
 
@@ -123,8 +125,9 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   /* var->cnsts_number = 0; *//* Useless because of the calloc  */
   var->weight = weight;
   var->bound = bound;
-  var->value = -1;
-  insert_variable(sys, var);
+  var->value = 0.0;
+  if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
+  else xbt_swag_insert_at_tail(var,&(sys->variable_set));
 
   return var;
 }
@@ -135,20 +138,20 @@ void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
   lmm_var_free(sys, var);
 }
 
-xbt_maxmin_float_t lmm_variable_getvalue(lmm_variable_t var)
+double lmm_variable_getvalue(lmm_variable_t var)
 {
   return (var->value);
 }
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, xbt_maxmin_float_t value)
+		lmm_variable_t var, double value)
 {
   lmm_element_t elem = NULL;
 
   sys->modified = 1;
 
-  if (var->cnsts_number >= var->cnsts_size)
-    abort();
+  xbt_assert0(var->cnsts_number < var->cnsts_size,
+	      "Too much constraints");
 
   elem = &(var->cnsts[var->cnsts_number++]);
 
@@ -156,27 +159,34 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
   elem->constraint = cnst;
   elem->variable = var;
 
-  insert_elem_in_constraint(elem);
+  if(var->weight) 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_constraint_t lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var, int num)
+lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
+				       lmm_variable_t var, int num)
 {
-  if(num<var->cnsts_number) return(var->cnsts[num].constraint);
-  else return NULL;
+  if (num < var->cnsts_number)
+    return (var->cnsts[num].constraint);
+  else
+    return NULL;
 }
 
 int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
 {
-  return(var->cnsts_number);
+  return (var->cnsts_number);
 }
 
-lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys, lmm_constraint_t cnst, 
-				     lmm_variable_t *var)
+lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
+				     lmm_constraint_t cnst,
+				     lmm_variable_t * var)
 {
-  if(!(*var)) xbt_swag_getFirst(&(cnst->element_set));
-  else *var=xbt_swag_getNext(*var,cnst->element_set.offset);
+  if (!(*var))
+    xbt_swag_getFirst(&(cnst->element_set));
+  else
+    *var = xbt_swag_getNext(*var, cnst->element_set.offset);
   return *var;
 }
 
@@ -190,20 +200,21 @@ void *lmm_variable_id(lmm_variable_t var)
   return var->id;
 }
 
-static void saturated_constraints_update(lmm_system_t sys,
-					 lmm_constraint_t cnst,
-					 xbt_maxmin_float_t * min_usage)
+static void saturated_constraint_set_update(lmm_system_t sys,
+					    lmm_constraint_t cnst,
+					    double *min_usage)
 {
   lmm_constraint_t useless_cnst = NULL;
 
-  sys->modified = 1;
-
+  if (cnst->usage <= 0)
+    return;
   if (cnst->remaining <= 0)
     return;
   if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
     *min_usage = cnst->remaining / cnst->usage;
 
-    while ((useless_cnst = xbt_swag_getFirst(&(sys->saturated_constraint_set))))
+    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));
@@ -212,21 +223,21 @@ static void saturated_constraints_update(lmm_system_t sys,
   }
 }
 
-static void saturated_variables_update(lmm_system_t sys)
+static void saturated_variable_set_update(lmm_system_t sys)
 {
   lmm_constraint_t cnst = NULL;
   xbt_swag_t cnst_list = NULL;
   lmm_element_t elem = NULL;
   xbt_swag_t elem_list = NULL;
 
-  sys->modified = 1;
-
   cnst_list = &(sys->saturated_constraint_set);
   while ((cnst = xbt_swag_getFirst(cnst_list))) {
-/*   xbt_swag_foreach(cnst, cnst_list) { */
     elem_list = &(cnst->active_element_set);
-    xbt_swag_foreach(elem, elem_list)
+    xbt_swag_foreach(elem, elem_list) {
+      if(elem->variable->weight<=0) break;
+      if ((elem->value > 0))
 	xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+    }
     xbt_swag_remove(cnst, cnst_list);
   }
 
@@ -240,14 +251,15 @@ void lmm_solve(lmm_system_t sys)
   xbt_swag_t cnst_list = NULL;
   xbt_swag_t var_list = NULL;
   xbt_swag_t elem_list = NULL;
-  xbt_maxmin_float_t min_usage = -1;
+  double min_usage = -1;
 
-  if(!(sys->modified)) return;
+  if (!(sys->modified))
+    return;
 
   /* Init */
   var_list = &(sys->variable_set);
   xbt_swag_foreach(var, var_list) {
-    var->value = -1;
+    var->value = 0.0;
   }
 
 
@@ -260,15 +272,18 @@ void lmm_solve(lmm_system_t sys)
     cnst->remaining = cnst->bound;
     cnst->usage = 0;
     xbt_swag_foreach(elem, elem_list) {
-      cnst->usage += elem->value / elem->variable->weight;
-      insert_active_elem_in_constraint(elem);
+      if(elem->variable->weight <=0) break;
+      if ((elem->value > 0)) {
+	cnst->usage += elem->value / elem->variable->weight;
+	make_elem_active(elem);
+      }
     }
 
     /* Saturated constraints update */
-    saturated_constraints_update(sys, cnst, &min_usage);
+    saturated_constraint_set_update(sys, cnst, &min_usage);
   }
 
-  saturated_variables_update(sys);
+  saturated_variable_set_update(sys);
 
   /* Saturated variables update */
 
@@ -298,7 +313,7 @@ void lmm_solve(lmm_system_t sys)
 	cnst = elem->constraint;
 	cnst->remaining -= elem->value * var->value;
 	cnst->usage -= elem->value / var->weight;
-	remove_active_elem_in_constraint(elem);
+	make_elem_inactive(elem);
       }
       xbt_swag_remove(var, var_list);
     }
@@ -307,9 +322,9 @@ void lmm_solve(lmm_system_t sys)
     cnst_list = &(sys->active_constraint_set);
     min_usage = -1;
     xbt_swag_foreach(cnst, cnst_list) {
-      saturated_constraints_update(sys, cnst, &min_usage);
+      saturated_constraint_set_update(sys, cnst, &min_usage);
     }
-    saturated_variables_update(sys);
+    saturated_variable_set_update(sys);
 
   } while (xbt_swag_size(&(sys->saturated_variable_set)));
 
@@ -319,35 +334,53 @@ 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, xbt_maxmin_float_t value)
+		lmm_variable_t var, double value)
 {
   int i;
-  lmm_element_t elem = NULL;
 
   sys->modified = 1;
   for (i = 0; i < var->cnsts_number; i++)
     if (var->cnsts[i].constraint == cnst) {
-      elem->value = value;
+      var->cnsts[i].value = value;
       return;
     }
 }
 
 void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
-			       xbt_maxmin_float_t bound)
+			       double bound)
 {
   sys->modified = 1;
   var->bound = bound;
 }
 
 void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
-				xbt_maxmin_float_t weight)
+				double weight)
 {
+  int i ;
+  lmm_element_t elem;
+
   sys->modified = 1;
   var->weight = weight;
+  xbt_swag_remove(var,&(sys->variable_set));
+  if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
+  else xbt_swag_insert_at_tail(var,&(sys->variable_set));
+
+  for (i = 0; i < var->cnsts_number; i++) {
+    elem = &var->cnsts[i];
+    xbt_swag_remove(elem, &(elem->constraint->element_set));
+    if(weight) xbt_swag_insert_at_head(elem, &(elem->constraint->element_set));
+    else xbt_swag_insert_at_tail(elem, &(elem->constraint->element_set));
+  }
+}
+
+double lmm_get_variable_weight(lmm_variable_t var)
+				  
+{
+  return var->weight;
 }
 
 void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
-				 xbt_maxmin_float_t bound)
+				 double bound)
 {
   sys->modified = 1;
   cnst->bound = bound;
@@ -355,7 +388,17 @@ void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
 
 int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
 {
-  return xbt_swag_belongs(cnst,&(sys->active_constraint_set));
+  return xbt_swag_belongs(cnst, &(sys->active_constraint_set));
+}
+
+lmm_constraint_t lmm_get_first_active_constraint(lmm_system_t sys)
+{
+  return xbt_swag_getFirst(&(sys->active_constraint_set));
+}
+
+lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint_t cnst)
+{
+  return xbt_swag_getNext(cnst,(sys->active_constraint_set).offset);
 }