X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c0662ce683e29ed5498a7ed4f961d152a1e1ba5..49324ddce4feba6d5664c40e0fa3817460ca5549:/src/surf/maxmin.c diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index e5d548fc02..3dd91a28ae 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -79,8 +79,8 @@ 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) { - xbt_assert0(xbt_swag_size(&(cnst->element_set)), - "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); } @@ -148,7 +148,7 @@ void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst, sys->modified = 1; - xbt_assert0(var->cnsts_number >= var->cnsts_size, + xbt_assert0(var->cnsts_number < var->cnsts_size, "Too much constraints"); elem = &(var->cnsts[var->cnsts_number++]); @@ -347,11 +347,10 @@ void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var, var->bound = bound; } -void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var, - double weight) +double lmm_get_variable_weight(lmm_system_t sys, lmm_variable_t var) + { - sys->modified = 1; - var->weight = weight; + return var->weight; } void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,