X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c788771aa7185d8f45f0f9705c5460d9749b6303..4127785827a5debfc03b9e6c09a7bfc45513951e:/src/surf/maxmin.c diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index 1f1609eba7..1a03fbf4d5 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -501,6 +501,8 @@ void lmm_solve(lmm_system_t sys) xbt_swag_foreach(cnst, cnst_list) { /* INIT */ cnst->remaining = cnst->bound; + if (cnst->remaining == 0) + continue; cnst->usage = 0; elem_list = &(cnst->element_set); xbt_swag_foreach(elem, elem_list) { @@ -576,14 +578,14 @@ void lmm_solve(lmm_system_t sys) } else { /* FIXME one day: We recompute usage.... :( */ cnst->usage = 0.0; make_elem_inactive(elem); + elem_list = &(cnst->element_set); xbt_swag_foreach(elem, elem_list) { if (elem->variable->weight <= 0) break; if (elem->variable->value > 0) break; if ((elem->value > 0)) { - if (cnst->usage < elem->value / elem->variable->weight) - cnst->usage = elem->value / elem->variable->weight; + cnst->usage=MAX(cnst->usage,elem->value / elem->variable->weight); DEBUG2("Constraint Usage %d : %f", cnst->id_int, cnst->usage); make_elem_active(elem); }