Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Max-min solver written ! :) Seems to be working fine !
authoralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 11 Nov 2004 00:46:49 +0000 (00:46 +0000)
committeralegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 11 Nov 2004 00:46:49 +0000 (00:46 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@495 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/include/surf/maxmin.h
src/surf/maxmin.c
src/surf/maxmin_private.h
testsuite/surf/maxmin_usage.c

index 76d3d60..f287a96 100644 (file)
@@ -12,15 +12,24 @@ typedef struct lmm_system *lmm_system_t;
 lmm_system_t lmm_system_new(void);
 void lmm_system_free(lmm_system_t sys);
 
-lmm_constraint_t lmm_constraint_new(lmm_system_t sys,  /* void *id, */
+lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id, 
                                    FLOAT bound_value);
 void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst);
 
-lmm_variable_t lmm_variable_new(lmm_system_t sys,      /* void *id, */
+lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id, 
                                FLOAT weight_value, FLOAT bound,
                                int number_of_constraints);
 void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);
-void lmm_add_constraint(lmm_system_t sys, lmm_constraint_t cnst,
-                       lmm_variable_t var, FLOAT value);
+FLOAT lmm_variable_getvalue(lmm_variable_t var);
+
+
+void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
+               lmm_variable_t var, FLOAT value);
+
+void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
+               lmm_variable_t var, FLOAT value);
+void lmm_update_variable_bound(lmm_variable_t var, FLOAT bound);
+void lmm_update_variable_weight(lmm_variable_t var, FLOAT weight);
+void lmm_update_constraint_bound(lmm_constraint_t cnst, FLOAT bound);
 
 void lmm_solve(lmm_system_t sys);
index 0d0ddba..a35bfff 100644 (file)
@@ -8,6 +8,17 @@
 #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;
+
+
 lmm_system_t lmm_system_new(void)
 {
   lmm_system_t l = NULL;
@@ -21,6 +32,14 @@ lmm_system_t lmm_system_new(void)
   xbt_swag_init(&(l->constraint_set),
                xbt_swag_offset(cnst, constraint_set_hookup));
 
+  xbt_swag_init(&(l->active_constraint_set),
+               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_init(&(l->saturated_constraint_set),
+               xbt_swag_offset(cnst, saturated_constraint_set_hookup));
+
   return l;
 }
 
@@ -30,15 +49,15 @@ void lmm_system_free(lmm_system_t sys)
   lmm_constraint_t cnst = NULL;
 
   while ((var = extract_variable(sys)))
-    lmm_var_free(var);
+    lmm_var_free(sys, var);
 
   while ((cnst = extract_constraint(sys)))
-    lmm_cnst_free(cnst);
+    lmm_cnst_free(sys, cnst);
 
   xbt_free(sys);
 }
 
-static void lmm_var_free(lmm_variable_t var)
+static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
 {
   int i;
   lmm_element_t elem = NULL;
@@ -46,19 +65,22 @@ static void lmm_var_free(lmm_variable_t var)
   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)))
+      make_constraint_inactive(sys, elem->constraint);
   }
   xbt_free(var->cnsts);
   xbt_free(var);
 }
 
-static void lmm_cnst_free(lmm_constraint_t cnst)
+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!"); */
+  remove_active_constraint(sys, cnst);
   xbt_free(cnst);
 }
 
-lmm_constraint_t lmm_constraint_new(lmm_system_t sys,  /* void *id, */
+lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
                                    FLOAT bound_value)
 {
   lmm_constraint_t cnst = NULL;
@@ -68,22 +90,26 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys,       /* void *id, */
 /*   cnst->id = id; */
   xbt_swag_init(&(cnst->element_set),
                xbt_swag_offset(elem, element_set_hookup));
+  xbt_swag_init(&(cnst->active_element_set),
+               xbt_swag_offset(elem, active_element_set_hookup));
 
   cnst->bound = bound_value;
-  cnst->usage = UNUSED_CONSTRAINT;
+  cnst->usage = 0;
   insert_constraint(sys, cnst);
 
+  cnst->id = id;
+
   return cnst;
 }
 
 void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
 {
   remove_constraint(sys, cnst);
-  lmm_cnst_free(cnst);
+  lmm_cnst_free(sys, cnst);
 }
 
-lmm_variable_t lmm_variable_new(lmm_system_t sys,      /* void *id, */
-                               FLOAT weight_value, FLOAT bound,
+lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
+                               FLOAT weight, FLOAT bound,
                                int number_of_constraints)
 {
   lmm_variable_t var = NULL;
@@ -93,47 +119,210 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, /* void *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_value = weight_value;
+  var->weight = weight;
   var->bound = bound;
   var->value = -1;
   insert_variable(sys, var);
 
+  var->id=id;
+
   return var;
 }
 
 void lmm_variable_free(lmm_system_t sys, lmm_variable_t var)
 {
   remove_variable(sys, var);
-  lmm_var_free(var);
+  lmm_var_free(sys, var);
 }
 
-void lmm_add_constraint(lmm_system_t sys, lmm_constraint_t cnst,
-                       lmm_variable_t var, FLOAT value)
+FLOAT 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, FLOAT value)
 {
   lmm_element_t elem = NULL;
 
-/*   xbt_assert0(var->cnsts_number<var->cnsts_size,"Too much constraint"); */
+  if (var->cnsts_number >= var->cnsts_size)
+    abort();
 
   elem = &(var->cnsts[var->cnsts_number++]);
 
   elem->value = value;
   elem->constraint = cnst;
+  elem->variable = var;
 
   insert_elem_in_constraint(elem);
 
+  make_constraint_active(sys, cnst);
+}
+
+static void saturated_constraints_update(lmm_system_t sys,
+                                        lmm_constraint_t cnst,
+                                        FLOAT * min_usage)
+{
+  lmm_constraint_t useless_cnst=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);
+
+    *min_usage = cnst->remaining / cnst->usage;
+
+    while (xbt_swag_extract
+          (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)
+{
+  lmm_constraint_t cnst = NULL;
+  xbt_swag_t cnst_list = NULL;
+  lmm_element_t elem = NULL;
+  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) { */
+    elem_list = &(cnst->active_element_set);
+    xbt_swag_foreach(elem, elem_list)
+       xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+    xbt_swag_extract(cnst,cnst_list);
+  }
+
 }
 
 void lmm_solve(lmm_system_t sys)
 {
-  void **id_table = NULL;
+  lmm_variable_t var = NULL;
+  lmm_constraint_t cnst = NULL;
+  lmm_element_t elem = NULL;
+  xbt_swag_t cnst_list = NULL;
+  xbt_swag_t var_list = NULL;
+  xbt_swag_t elem_list = NULL;
+  FLOAT min_usage = -1;
+
+  /* Init */
+  var_list=&(sys->variable_set);  
+  xbt_swag_foreach(var, var_list) {
+    var->value = -1;
+  }
+
 
   /* Compute Usage and store the variables that reach the maximum */
 
+  cnst_list = &(sys->active_constraint_set);
+  xbt_swag_foreach(cnst, cnst_list) {
+    /* INIT */
+    elem_list = &(cnst->element_set);
+    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);
+    }
+
+    /* Saturated constraints update */
+    saturated_constraints_update(sys, cnst, &min_usage);
+  }
+
+  saturated_variables_update(sys);
+
+  /* Saturated variables update */
+
   do {
     /* Fix the variables that have to be */
+    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)) {
+       min_usage = var->bound / var->weight;
+      }
+    }
+
+
+    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++) {
+       elem = &var->cnsts[i];
+       cnst = elem->constraint;
+       cnst->remaining -= elem->value * var->value;
+       cnst->usage -= elem->value / var->weight;
+       remove_active_elem_in_constraint(elem);
+      }
+      xbt_swag_extract(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_variables_update(sys);
+
+  } while (xbt_swag_size(&(sys->saturated_variable_set)));
+}
 
-    /* Update Usage and store the variables that reach the maximum */
+/* Not a O(1) function */
 
-  } while (1);
+void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
+               lmm_variable_t var, FLOAT value)
+{
+  int i;
+  lmm_element_t elem = NULL;
 
+  for (i = 0; i < var->cnsts_number; i++)
+    if(var->cnsts[i].constraint==cnst) {
+      elem->value =value;
+      return;
+    }
 }
+
+void lmm_update_variable_bound(lmm_variable_t var, FLOAT bound)
+{
+  var->bound=bound;
+}
+
+void lmm_update_variable_weight(lmm_variable_t var, FLOAT weight)
+{
+  var->weight=weight;
+}
+
+void lmm_update_constraint_bound(lmm_constraint_t cnst,
+                                FLOAT bound)
+{
+  cnst->bound=bound;
+}
+
+
+
+/* void lmm_print(lmm_system_t sys) */
+/* { */
+/*   lmm_variable_t var = NULL; */
+/*   lmm_constraint_t cnst = NULL; */
+/*   lmm_element_t elem = NULL; */
+/*   xbt_swag_t cnst_list = NULL; */
+/*   xbt_swag_t var_list = NULL; */
+/*   xbt_swag_t elem_list = NULL; */
+
+/*   var_list = &(sys->variable_set); */
+/*   xbt_swag_foreach(var, var_list) { */
+/*     printf("%s : {\n",var->id); */
+/*     printf("\t %s : {\n",var->id); */
+/*   } */
+/* } */
index 9f9002c..1a1e4e6 100644 (file)
@@ -7,29 +7,44 @@
 #include "xbt/swag.h"
 
 typedef struct lmm_element {
+  /* hookup to constraint */
   s_xbt_swag_hookup_t element_set_hookup;
+  s_xbt_swag_hookup_t active_element_set_hookup;
+
   lmm_constraint_t constraint;
-  FLOAT value;
+  lmm_variable_t variable;
+  FLOAT value;  
 } s_lmm_element_t, *lmm_element_t;
 #define insert_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->element_set))
+#define insert_active_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->active_element_set))
+#define remove_active_elem_in_constraint(elem) xbt_swag_extract(elem,&(elem->constraint->active_element_set))
 
 typedef struct lmm_constraint {
+  /* hookup to system */
   s_xbt_swag_hookup_t constraint_set_hookup;
-  /*   void *id; */
+  s_xbt_swag_hookup_t active_constraint_set_hookup;
+  s_xbt_swag_hookup_t saturated_constraint_set_hookup;
+
   s_xbt_swag_t element_set;    /* a list of lmm_mat_element_t */
+  s_xbt_swag_t active_element_set;     /* a list of lmm_mat_element_t */
   FLOAT bound;
+  FLOAT remaining;
   FLOAT usage;
+  char *id;
 } s_lmm_constraint_t;
 
 typedef struct lmm_variable {
+  /* hookup to system */
   s_xbt_swag_hookup_t variable_set_hookup;
-  /*   void *id; */
+  s_xbt_swag_hookup_t saturated_variable_set_hookup;
+
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
-  FLOAT weight_value;
+  FLOAT weight;
   FLOAT bound;
   FLOAT value;
+  char *id;
 } s_lmm_variable_t;
 
 typedef struct lmm_system {
@@ -37,17 +52,25 @@ typedef struct lmm_system {
   s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */
 
   s_xbt_swag_t active_constraint_set;  /* a list of lmm_constraint_t */
+
+  s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */
+  s_xbt_swag_t saturated_constraint_set;/* a list of lmm_constraint_t_t */
 } s_lmm_system_t;
 
 #define extract_variable(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
 #define extract_constraint(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
 #define insert_variable(sys,var) xbt_swag_insert(var,&(sys->variable_set))
 #define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set))
-#define remove_variable(sys,var) xbt_swag_extract(var,&(sys->variable_set))
-#define remove_constraint(sys,cnst) xbt_swag_extract(cnst,&(sys->constraint_set))
+#define remove_variable(sys,var) do {xbt_swag_extract(var,&(sys->variable_set));\
+                                 xbt_swag_extract(var,&(sys->saturated_variable_set));} while(0)
+#define remove_constraint(sys,cnst) do {xbt_swag_extract(cnst,&(sys->constraint_set));\
+                                        xbt_swag_extract(cnst,&(sys->saturated_constraint_set));} while(0)
+#define remove_active_constraint(sys,cnst) xbt_swag_extract(cnst,&(sys->active_constraint_set))
+#define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set))
+#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
 
-static void lmm_var_free(lmm_variable_t e);
-static void lmm_cnst_free(lmm_constraint_t cnst);
+static void lmm_var_free(lmm_system_t sys, lmm_variable_t var);
+static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
 
 /* #define UNDEFINED_VALUE -1.0 */
 #define UNUSED_CONSTRAINT -2.0
index 7fd7b48..d5c267f 100644 (file)
 
 /*                               */
 /*        ______                 */
-/*  ==l1==  l2  ==l3==           */
+/*  ==l1==  L2  ==L3==           */
 /*        ------                 */
 /*                               */
 
+  lmm_system_t Sys = NULL ;
+  lmm_constraint_t L1 = NULL;
+  lmm_constraint_t L2 = NULL;
+  lmm_constraint_t L3 = NULL;
+
+  lmm_variable_t R_1_2_3 = NULL;
+  lmm_variable_t R_1 = NULL;
+  lmm_variable_t R_2 = NULL;
+  lmm_variable_t R_3 = NULL;
+
 void test(void);
 void test(void)
 {
-  lmm_system_t sys = NULL ;
-  lmm_constraint_t l1 = NULL;
-  lmm_constraint_t l2 = NULL;
-  lmm_constraint_t l3 = NULL;
 
-  lmm_variable_t r_1_2_3 = NULL;
-  lmm_variable_t r_1 = NULL;
-  lmm_variable_t r_2 = NULL;
-  lmm_variable_t r_3 = NULL;
+  Sys = lmm_system_new();
+  L1 = lmm_constraint_new(Sys, (void *) "L1", 1.0);
+  L2 = lmm_constraint_new(Sys, (void *) "L2", 10.0);
+  L3 = lmm_constraint_new(Sys, (void *) "L3", 1.0);
+
+  R_1_2_3 = lmm_variable_new(Sys, (void *) "R 1->2->3", 1.0 , -1.0 , 3);
+  R_1 = lmm_variable_new(Sys, (void *) "R 1", 1.0 , -1.0 , 1);
+  R_2 = lmm_variable_new(Sys, (void *) "R 2", 1.0 , -1.0 , 1);
+  R_3 = lmm_variable_new(Sys, (void *) "R 3", 1.0 , -1.0 , 1);
+
+  lmm_expand(Sys, L1, R_1_2_3, 1.0);
+  lmm_expand(Sys, L2, R_1_2_3, 1.0);
+  lmm_expand(Sys, L3, R_1_2_3, 1.0);
+
+  lmm_expand(Sys, L1, R_1, 1.0);
 
+  lmm_expand(Sys, L2, R_2, 1.0);
 
+  lmm_expand(Sys, L3, R_3, 1.0);
 
-  sys = lmm_system_new();
-  l1 = lmm_constraint_new(sys, /* (void *) "L1", */ 1.0);
-  l2 = lmm_constraint_new(sys, /* (void *) "L2", */ 10.0);
-  l3 = lmm_constraint_new(sys, /* (void *) "L3", */ 1.0);
+#define AFFICHE(var) printf(#var " = %Lg\n",lmm_variable_getvalue(var));
+  AFFICHE(R_1_2_3);
+  AFFICHE(R_1);
+  AFFICHE(R_2);
+  AFFICHE(R_3);
 
-  r_1_2_3 = lmm_variable_new(sys, /* (void *) "R 1->2->3", */ 1.0 , 1.0 , 3);
-  r_1 = lmm_variable_new(sys, /* (void *) "R 1", */ 1.0 , 1.0 , 1);
-  r_2 = lmm_variable_new(sys, /* (void *) "R 2", */ 1.0 , 1.0 , 1);
-  r_3 = lmm_variable_new(sys, /* (void *) "R 3", */ 1.0 , 1.0 , 1);
+  printf("\n");
+  lmm_solve(Sys);
 
-  lmm_add_constraint(sys, l1, r_1_2_3, 1.0);
-  lmm_add_constraint(sys, l2, r_1_2_3, 1.0);
-  lmm_add_constraint(sys, l3, r_1_2_3, 1.0);
+  AFFICHE(R_1_2_3);
+  AFFICHE(R_1);
+  AFFICHE(R_2);
+  AFFICHE(R_3);
+  printf("\n");
 
-  lmm_add_constraint(sys, l1, r_1, 1.0);
 
-  lmm_add_constraint(sys, l2, r_2, 1.0);
+  lmm_update_variable_weight(R_1_2_3,.5);
+  lmm_solve(Sys);
 
-  lmm_add_constraint(sys, l3, r_3, 1.0);
+  AFFICHE(R_1_2_3);
+  AFFICHE(R_1);
+  AFFICHE(R_2);
+  AFFICHE(R_3);
+#undef AFFICHE
 
-  lmm_system_free(sys);
+  lmm_system_free(Sys);
 }