xbt_free(sys);
}
-static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
+void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var)
{
int i;
lmm_element_t elem = NULL;
for (i = 0; i < var->cnsts_number; i++) {
elem = &var->cnsts[i];
- xbt_swag_extract(elem, &(elem->constraint->element_set));
+ xbt_swag_remove(elem, &(elem->constraint->element_set));
if (xbt_swag_size(&(elem->constraint->element_set)))
make_constraint_inactive(sys, elem->constraint);
}
+ var->cnsts_number = 0;
+}
+
+static void lmm_var_free(lmm_system_t sys, lmm_variable_t var)
+{
+
+ lmm_variable_disable(sys, var);
+
xbt_free(var->cnsts);
xbt_free(var);
}
s_lmm_element_t elem;
cnst = xbt_new0(s_lmm_constraint_t, 1);
-/* cnst->id = id; */
+ cnst->id = id;
xbt_swag_init(&(cnst->element_set),
xbt_swag_offset(elem, element_set_hookup));
xbt_swag_init(&(cnst->active_element_set),
cnst->usage = 0;
insert_constraint(sys, cnst);
- cnst->id = id;
-
return cnst;
}
lmm_variable_t var = NULL;
var = xbt_new0(s_lmm_variable_t, 1);
-/* var->id = id; */
+ var->id = id;
var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
var->cnsts_size = number_of_constraints;
/* var->cnsts_number = 0; *//* Useless because of the calloc */
var->value = -1;
insert_variable(sys, var);
- var->id = id;
-
return var;
}
make_constraint_active(sys, cnst);
}
+lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var, int num)
+{
+ if(num<var->cnsts_number) return(var->cnsts[num].constraint);
+ else return NULL;
+}
+
+int lmm_get_number_of_cnst_from_var(lmm_system_t sys, lmm_variable_t var)
+{
+ return(var->cnsts_number);
+}
+
+void *lmm_constraint_id(lmm_constraint_t cnst)
+{
+ return cnst->id;
+}
+
+void *lmm_variable_id(lmm_variable_t var)
+{
+ return var->id;
+}
+
static void saturated_constraints_update(lmm_system_t sys,
lmm_constraint_t cnst,
xbt_maxmin_float_t * min_usage)
if (cnst->remaining <= 0)
return;
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
- xbt_swag_t active_elem_list = &(cnst->active_element_set);
-
*min_usage = cnst->remaining / cnst->usage;
while ((useless_cnst = xbt_swag_getFirst(&(sys->saturated_constraint_set))))
- xbt_swag_extract(useless_cnst, &(sys->saturated_constraint_set));
+ xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
} else if (*min_usage == cnst->remaining / cnst->usage) {
elem_list = &(cnst->active_element_set);
xbt_swag_foreach(elem, elem_list)
xbt_swag_insert(elem->variable, &(sys->saturated_variable_set));
- xbt_swag_extract(cnst, cnst_list);
+ xbt_swag_remove(cnst, cnst_list);
}
}
cnst->usage -= elem->value / var->weight;
remove_active_elem_in_constraint(elem);
}
- xbt_swag_extract(var, var_list);
+ xbt_swag_remove(var, var_list);
}
/* Find out which variables reach the maximum */