#include "xbt/sysdep.h"
-#include "xbt/error.h"
+#include "xbt/log.h"
#include "maxmin_private.h"
#include <stdlib.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(maxmin, surf,
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)
int i;
lmm_element_t elem = NULL;
+ XBT_IN2("%p,%p",sys,var);
sys->modified = 1;
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;
+ XBT_OUT;
}
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);
+ 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,
cnst->bound = bound_value;
cnst->usage = 0;
+ cnst->shared = 1;
insert_constraint(sys, cnst);
return cnst;
}
+void lmm_constraint_shared(lmm_constraint_t cnst)
+{
+ cnst->shared = 0;
+}
+
void lmm_constraint_free(lmm_system_t sys, lmm_constraint_t cnst)
{
remove_constraint(sys, cnst);
double bound, int number_of_constraints)
{
lmm_variable_t var = NULL;
-
+ int i;
var = xbt_new0(s_lmm_variable_t, 1);
var->id = id;
var->cnsts = xbt_new0(s_lmm_element_t, number_of_constraints);
+ for(i=0; i<number_of_constraints; i++) {
+ /* Should be useless because of the
+ calloc but it seems to help valgrind... */
+ var->cnsts[i].element_set_hookup.next = NULL;
+ var->cnsts[i].element_set_hookup.prev = NULL;
+ var->cnsts[i].active_element_set_hookup.next = NULL;
+ var->cnsts[i].active_element_set_hookup.prev = NULL;
+ var->cnsts[i].constraint = NULL;
+ var->cnsts[i].variable = NULL;
+ var->cnsts[i].value = 0.0;
+ }
var->cnsts_size = number_of_constraints;
- /* var->cnsts_number = 0; *//* Useless because of the calloc */
+ var->cnsts_number = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
var->weight = weight;
var->bound = bound;
var->value = 0.0;
make_constraint_active(sys, cnst);
}
+void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
+ lmm_variable_t var, double value)
+{
+ int i ;
+ sys->modified = 1;
+
+ for(i=0; i< var->cnsts_number ; i++)
+ if(var->cnsts[i].constraint == cnst) break;
+
+ if(i<var->cnsts_number) var->cnsts[i].value +=value;
+ else lmm_expand(sys,cnst,var,value);
+}
+
+void lmm_elem_set_value(lmm_system_t sys, lmm_constraint_t cnst,
+ lmm_variable_t var, double value)
+{
+ int i ;
+
+ for(i=0; i< var->cnsts_number ; i++)
+ if(var->cnsts[i].constraint == cnst) break;
+
+ if(i<var->cnsts_number) {
+ var->cnsts[i].value =value;
+ sys->modified = 1;
+ } else DIE_IMPOSSIBLE;
+}
+
lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys,
lmm_variable_t var, int num)
{
}
xbt_swag_remove(cnst, cnst_list);
}
-
}
+/* static void lmm_print(lmm_system_t sys) */
+/* { */
+/* lmm_constraint_t cnst = NULL; */
+/* lmm_element_t elem = NULL; */
+/* xbt_swag_t cnst_list = NULL; */
+/* xbt_swag_t elem_list = NULL; */
+
+/* cnst_list = &(sys->active_constraint_set); */
+/* xbt_swag_foreach(cnst, cnst_list) { */
+/* elem_list = &(cnst->element_set); */
+/* xbt_swag_foreach(elem, elem_list) { */
+/* printf("%g.%p(%g) + ",elem->value, elem->variable,elem->variable->weight); */
+/* } */
+/* printf("0 <= %g \n",cnst->bound); */
+/* } */
+/* fflush(NULL); */
+/* } */
+
void lmm_solve(lmm_system_t sys)
{
lmm_variable_t var = NULL;
/* Init */
var_list = &(sys->variable_set);
+ DEBUG1("Variable set : %d", xbt_swag_size(var_list));
xbt_swag_foreach(var, var_list) {
var->value = 0.0;
}
/* Compute Usage and store the variables that reach the maximum */
cnst_list = &(sys->active_constraint_set);
+ DEBUG1("Active constraints : %d", xbt_swag_size(cnst_list));
xbt_swag_foreach(cnst, cnst_list) {
/* INIT */
- elem_list = &(cnst->element_set);
cnst->remaining = cnst->bound;
cnst->usage = 0;
+ elem_list = &(cnst->element_set);
xbt_swag_foreach(elem, elem_list) {
if(elem->variable->weight <=0) break;
if ((elem->value > 0)) {
- cnst->usage += elem->value / elem->variable->weight;
- insert_active_elem_in_constraint(elem);
+ if(cnst->shared)
+ cnst->usage += elem->value / elem->variable->weight;
+ else
+ cnst->usage = 1;
+ make_elem_active(elem);
}
}
/* Fix the variables that have to be */
var_list = &(sys->saturated_variable_set);
-
xbt_swag_foreach(var, var_list) {
/* First check if some of these variables have reach their upper
bound and update min_usage accordingly. */
for (i = 0; i < var->cnsts_number; i++) {
elem = &var->cnsts[i];
cnst = elem->constraint;
- cnst->remaining -= elem->value * var->value;
- cnst->usage -= elem->value / var->weight;
- remove_active_elem_in_constraint(elem);
+ if(cnst->shared) {
+ cnst->remaining -= elem->value * var->value;
+ cnst->usage -= elem->value / var->weight;
+ }
+ make_elem_inactive(elem);
}
xbt_swag_remove(var, var_list);
}
} while (xbt_swag_size(&(sys->saturated_variable_set)));
sys->modified = 0;
+/* lmm_print(sys); */
}
/* Not a O(1) function */
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 xbt_swag_getNext(cnst,(sys->active_constraint_set).offset);
}
-
-/* void lmm_print(lmm_system_t sys) */
-/* { */
-/* lmm_variable_t var = NULL; */
-/* lmm_constraint_t cnst = NULL; */
-/* lmm_element_t elem = NULL; */
-/* xbt_swag_t cnst_list = NULL; */
-/* xbt_swag_t var_list = NULL; */
-/* xbt_swag_t elem_list = NULL; */
-
-/* var_list = &(sys->variable_set); */
-/* xbt_swag_foreach(var, var_list) { */
-/* printf("%s : {\n",var->id); */
-/* printf("\t %s : {\n",var->id); */
-/* } */
-/* } */
