#include "xbt/error.h"
#include "maxmin_private.h"
#include <stdlib.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
+ "Logging specific to the SURF maxmin module");
lmm_system_t lmm_system_new(void)
{
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!"); */
+/* xbt_assert0(xbt_swag_size(&(cnst->element_set)), */
+/* "This list should be empty!"); */
remove_active_constraint(sys, cnst);
xbt_free(cnst);
}
var->weight = weight;
var->bound = bound;
var->value = 0.0;
- insert_variable(sys, var);
+ if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
+ else xbt_swag_insert_at_tail(var,&(sys->variable_set));
return var;
}
sys->modified = 1;
- if (var->cnsts_number >= var->cnsts_size)
- abort();
+ xbt_assert0(var->cnsts_number < var->cnsts_size,
+ "Too much constraints");
elem = &(var->cnsts[var->cnsts_number++]);
elem->constraint = cnst;
elem->variable = var;
- insert_elem_in_constraint(elem);
+ if(var->weight) xbt_swag_insert_at_head(elem,&(elem->constraint->element_set));
+ else xbt_swag_insert_at_tail(elem,&(elem->constraint->element_set));
make_constraint_active(sys, cnst);
}
cnst_list = &(sys->saturated_constraint_set);
while ((cnst = xbt_swag_getFirst(cnst_list))) {
elem_list = &(cnst->active_element_set);
- xbt_swag_foreach(elem, elem_list)
- if ((elem->value > 0) && (elem->variable->weight > 0))
- xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ xbt_swag_foreach(elem, elem_list) {
+ if(elem->variable->weight<=0) break;
+ if ((elem->value > 0))
+ xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
+ }
xbt_swag_remove(cnst, cnst_list);
}
cnst->remaining = cnst->bound;
cnst->usage = 0;
xbt_swag_foreach(elem, elem_list) {
- if ((elem->value > 0) && (elem->variable->weight > 0)) {
+ if(elem->variable->weight <=0) break;
+ if ((elem->value > 0)) {
cnst->usage += elem->value / elem->variable->weight;
insert_active_elem_in_constraint(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));
+}
+
+
+double lmm_get_variable_weight(lmm_variable_t var)
+
+{
+ return var->weight;
}
void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,