X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ef0fb1245e9d6d3efea3b0940fcce04d9b19478..536e2df34e0f3594005c270f62d8f5c074fec732:/src/surf/maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index a35bfff6c7..7d5dbf0e99 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -1,23 +1,17 @@
-/* Authors: Arnaud Legrand                                                  */
+/* 	$Id$	 */
+
+/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
 
 /* This program is free software; you can redistribute it and/or modify it
-   under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 
 #include "xbt/sysdep.h"
 #include "xbt/error.h"
 #include "maxmin_private.h"
 #include <stdlib.h>
-
-extern lmm_system_t Sys;
-extern lmm_constraint_t L1;
-extern lmm_constraint_t L2;
-extern lmm_constraint_t L3;
-
-extern lmm_variable_t R_1_2_3;
-extern lmm_variable_t R_1;
-extern lmm_variable_t R_2;
-extern lmm_variable_t R_3;
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
+				"Logging specific to the SURF maxmin module");
 
 lmm_system_t lmm_system_new(void)
 {
@@ -27,6 +21,7 @@ lmm_system_t lmm_system_new(void)
 
   l = xbt_new0(s_lmm_system_t, 1);
 
+  l->modified = 0;
   xbt_swag_init(&(l->variable_set),
 		xbt_swag_offset(var, variable_set_hookup));
   xbt_swag_init(&(l->constraint_set),
@@ -54,40 +49,51 @@ void lmm_system_free(lmm_system_t sys)
   while ((cnst = extract_constraint(sys)))
     lmm_cnst_free(sys, cnst);
 
-  xbt_free(sys);
+  free(sys);
 }
 
-static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
+void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
 {
   int i;
   lmm_element_t elem = NULL;
 
+  sys->modified = 1;
+
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
-    xbt_swag_extract(elem, &(elem->constraint->element_set));
-    if (xbt_swag_size(&(elem->constraint->element_set)))
+    xbt_swag_remove(elem, &(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);
   }
-  xbt_free(var->cnsts);
-  xbt_free(var);
+  var->cnsts_number = 0;
+}
+
+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);
+  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,
-				    FLOAT bound_value)
+				    double bound_value)
 {
   lmm_constraint_t cnst = NULL;
   s_lmm_element_t elem;
 
   cnst = xbt_new0(s_lmm_constraint_t, 1);
-/*   cnst->id = id; */
+  cnst->id = id;
   xbt_swag_init(&(cnst->element_set),
 		xbt_swag_offset(elem, element_set_hookup));
   xbt_swag_init(&(cnst->active_element_set),
@@ -97,8 +103,6 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   cnst->usage = 0;
   insert_constraint(sys, cnst);
 
-  cnst->id = id;
-
   return cnst;
 }
 
@@ -109,22 +113,21 @@ void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
 }
 
 lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
-				FLOAT weight, FLOAT bound,
-				int number_of_constraints)
+				double weight,
+				double bound, int number_of_constraints)
 {
   lmm_variable_t var = NULL;
 
   var = xbt_new0(s_lmm_variable_t, 1);
-/*   var->id = id; */
+  var->id = id;
   var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
   var->cnsts_size = number_of_constraints;
   /* var->cnsts_number = 0; *//* Useless because of the calloc  */
   var->weight = weight;
   var->bound = bound;
-  var->value = -1;
-  insert_variable(sys, var);
-
-  var->id=id;
+  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,18 +138,20 @@ void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
   lmm_var_free(sys, var);
 }
 
-FLOAT lmm_variable_getvalue(lmm_variable_t var)
+double lmm_variable_getvalue(lmm_variable_t var)
 {
-  return(var->value);
+  return (var->value);
 }
 
 void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
-			   lmm_variable_t var, FLOAT value)
+		lmm_variable_t var, double value)
 {
   lmm_element_t elem = NULL;
 
-  if (var->cnsts_number >= var->cnsts_size)
-    abort();
+  sys->modified = 1;
+
+  xbt_assert0(var->cnsts_number < var->cnsts_size,
+	      "Too much constraints");
 
   elem = &(var->cnsts[var->cnsts_number++]);
 
@@ -154,33 +159,71 @@ 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);
 }
 
-static void saturated_constraints_update(lmm_system_t sys,
-					 lmm_constraint_t cnst,
-					 FLOAT * min_usage)
+lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
+				       lmm_variable_t var, int num)
 {
-  lmm_constraint_t useless_cnst=NULL;
+  if (num < var->cnsts_number)
+    return (var->cnsts[num].constraint);
+  else
+    return NULL;
+}
 
-  if(cnst->remaining<=0) return;
-  if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
-    xbt_swag_t active_elem_list = &(cnst->active_element_set);
+int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
+{
+  return (var->cnsts_number);
+}
+
+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);
+  return *var;
+}
 
+void *lmm_constraint_id(lmm_constraint_t cnst)
+{
+  return cnst->id;
+}
+
+void *lmm_variable_id(lmm_variable_t var)
+{
+  return var->id;
+}
+
+static void saturated_constraint_set_update(lmm_system_t sys,
+					    lmm_constraint_t cnst,
+					    double *min_usage)
+{
+  lmm_constraint_t useless_cnst = NULL;
+
+  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 (xbt_swag_extract
-	   (useless_cnst, &(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));
   } else if (*min_usage == cnst->remaining / cnst->usage) {
     xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
   }
 }
 
-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;
@@ -188,12 +231,14 @@ static void saturated_variables_update(lmm_system_t sys)
   xbt_swag_t elem_list = NULL;
 
   cnst_list = &(sys->saturated_constraint_set);
-  while((cnst=xbt_swag_getFirst(cnst_list))) {
-/*   xbt_swag_foreach(cnst, cnst_list) { */
+  while ((cnst = xbt_swag_getFirst(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_extract(cnst,cnst_list);
+    }
+    xbt_swag_remove(cnst, cnst_list);
   }
 
 }
@@ -206,12 +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;
-  FLOAT min_usage = -1;
+  double min_usage = -1;
+
+  if (!(sys->modified))
+    return;
 
   /* Init */
-  var_list=&(sys->variable_set);  
+  var_list = &(sys->variable_set);
   xbt_swag_foreach(var, var_list) {
-    var->value = -1;
+    var->value = 0.0;
   }
 
 
@@ -224,37 +272,40 @@ 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 */
 
   do {
     /* Fix the variables that have to be */
-    var_list=&(sys->saturated_variable_set);
+    var_list = &(sys->saturated_variable_set);
 
 
     xbt_swag_foreach(var, var_list) {
       /* First check if some of these variables have reach their upper
-	 bound and update min_usage accordingly. */
-      if((var->bound>0) && (var->bound / var->weight < min_usage)) {
+         bound and update min_usage accordingly. */
+      if ((var->bound > 0) && (var->bound / var->weight < min_usage)) {
 	min_usage = var->bound / var->weight;
       }
     }
 
 
-    while((var=xbt_swag_getFirst(var_list))) {
-      int i ;
+    while ((var = xbt_swag_getFirst(var_list))) {
+      int i;
 
       var->value = min_usage / var->weight;
-      
+
       /* Update usage */
 
       for (i = 0; i < var->cnsts_number; i++) {
@@ -262,53 +313,93 @@ 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_extract(var,var_list);
+      xbt_swag_remove(var, var_list);
     }
-    
+
     /* Find out which variables reach the maximum */
     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)));
+
+  sys->modified = 0;
 }
 
 /* Not a O(1) function */
 
 void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
-		lmm_variable_t var, FLOAT 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;
+    if (var->cnsts[i].constraint == cnst) {
+      var->cnsts[i].value = value;
       return;
     }
 }
 
-void lmm_update_variable_bound(lmm_variable_t var, FLOAT bound)
+void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
+			       double bound)
+{
+  sys->modified = 1;
+  var->bound = bound;
+}
+
+void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
+				double weight)
 {
-  var->bound=bound;
+  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));
+  }
 }
 
-void lmm_update_variable_weight(lmm_variable_t var, FLOAT weight)
+double lmm_get_variable_weight(lmm_variable_t var)
+				  
 {
-  var->weight=weight;
+  return var->weight;
 }
 
-void lmm_update_constraint_bound(lmm_constraint_t cnst,
-				 FLOAT bound)
+void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
+				 double bound)
 {
-  cnst->bound=bound;
+  sys->modified = 1;
+  cnst->bound = bound;
 }
 
+int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
+{
+  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);
+}
 
 
 /* void lmm_print(lmm_system_t sys) */