while ((cnst = extract_constraint(sys)))
lmm_cnst_free(sys, cnst);
- xbt_free(sys);
+ free(sys);
}
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)))
+ xbt_swag_remove(elem, &(elem->constraint->active_element_set));
+ if (!xbt_swag_size(&(elem->constraint->element_set)))
make_constraint_inactive(sys, elem->constraint);
}
var->cnsts_number = 0;
{
lmm_variable_disable(sys, var);
-
- xbt_free(var->cnsts);
- xbt_free(var);
+ memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
+ free(var->cnsts);
+ free(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!"); */
remove_active_constraint(sys, cnst);
- xbt_free(cnst);
+ free(cnst);
}
lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
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;
}
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);
+ make_elem_active(elem);
}
}
cnst = elem->constraint;
cnst->remaining -= elem->value * var->value;
cnst->usage -= elem->value / var->weight;
- remove_active_elem_in_constraint(elem);
+ make_elem_inactive(elem);
}
xbt_swag_remove(var, var_list);
}
var->bound = bound;
}
-double lmm_get_variable_weight(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)
{
return var->weight;
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) */
/* { */