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

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index a921063bb2..a4c1bbb829 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -8,15 +8,15 @@
 #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_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;
+/* 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)
@@ -57,17 +57,25 @@ void lmm_system_free(lmm_system_t sys)
   xbt_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;
 
   for (i = 0; i < var->cnsts_number; i++) {
     elem = &var->cnsts[i];
-    xbt_swag_extract(elem, &(elem->constraint->element_set));
+    xbt_swag_remove(elem, &(elem->constraint->element_set));
     if (xbt_swag_size(&(elem->constraint->element_set)))
       make_constraint_inactive(sys, elem->constraint);
   }
+  var->cnsts_number = 0;
+}
+
+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);
 }
@@ -87,7 +95,7 @@ lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
   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 +105,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;
 }
 
@@ -116,7 +122,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   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  */
@@ -125,8 +131,6 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   var->value = -1;
   insert_variable(sys, var);
 
-  var->id = id;
-
   return var;
 }
 
@@ -160,6 +164,27 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
   make_constraint_active(sys, cnst);
 }
 
+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;
+}
+
+int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
+{
+  return(var->cnsts_number);
+}
+
+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_constraints_update(lmm_system_t sys,
 					 lmm_constraint_t cnst,
 					 xbt_maxmin_float_t * min_usage)
@@ -173,9 +198,9 @@ static void saturated_constraints_update(lmm_system_t sys,
 
     *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));
@@ -195,7 +220,7 @@ static void saturated_variables_update(lmm_system_t sys)
     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);
+    xbt_swag_remove(cnst, cnst_list);
   }
 
 }
@@ -266,7 +291,7 @@ void lmm_solve(lmm_system_t sys)
 	cnst->usage -= elem->value / var->weight;
 	remove_active_elem_in_constraint(elem);
       }
-      xbt_swag_extract(var, var_list);
+      xbt_swag_remove(var, var_list);
     }
 
     /* Find out which variables reach the maximum */
@@ -313,6 +338,10 @@ void lmm_update_constraint_bound(lmm_constraint_t cnst,
   cnst->bound = bound;
 }
 
+int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
+{
+  return xbt_swag_belongs(cnst,&(sys->active_constraint_set));
+}
 
 
 /* void lmm_print(lmm_system_t sys) */