Bugfix... I had forgotten to reorder elements when updating a variable weight (and...

[simgrid.git] / src / surf / maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 31d816a..44faf0d 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -62,7 +62,7 @@ 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)))
+    if (!xbt_swag_size(&(elem->constraint->element_set)))
       make_constraint_inactive(sys, elem->constraint);
   }
   var->cnsts_number = 0;
@@ -355,13 +355,22 @@ void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
 void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
                                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)
                                  
@@ -381,6 +390,16 @@ 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) */
 /* { */