#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)
{
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);
-
+ memset(var->cnsts,0,var->cnsts_size*sizeof(s_lmm_element_t));
xbt_free(var->cnsts);
xbt_free(var);
}
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);
}
lmm_constraint_t lmm_constraint_new(lmm_system_t sys, void *id,
- xbt_maxmin_float_t bound_value)
+ double bound_value)
{
lmm_constraint_t cnst = NULL;
s_lmm_element_t elem;
}
lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
- xbt_maxmin_float_t weight,
- xbt_maxmin_float_t bound,
- int number_of_constraints)
+ double weight,
+ double bound, int number_of_constraints)
{
lmm_variable_t var = NULL;
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;
}
lmm_var_free(sys, var);
}
-xbt_maxmin_float_t lmm_variable_getvalue(lmm_variable_t var)
+double lmm_variable_getvalue(lmm_variable_t var)
{
return (var->value);
}
void lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
- lmm_variable_t var, xbt_maxmin_float_t value)
+ lmm_variable_t var, double value)
{
lmm_element_t elem = NULL;
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);
}
-lmm_constraint_t lmm_get_cnst_from_var(lmm_system_t sys, lmm_variable_t var, int num)
+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;
+ 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);
+ return (var->cnsts_number);
}
-lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys, lmm_constraint_t cnst,
- lmm_variable_t *var)
+lmm_variable_t lmm_get_var_from_cnst(lmm_system_t sys,
+ lmm_constraint_t cnst,
+ lmm_variable_t * var)
{
- if(!(*var)) xbt_swag_getFirst(&(cnst->element_set));
- else *var=xbt_swag_getNext(*var,cnst->element_set.offset);
+ if (!(*var))
+ xbt_swag_getFirst(&(cnst->element_set));
+ else
+ *var = xbt_swag_getNext(*var, cnst->element_set.offset);
return *var;
}
}
static void saturated_constraint_set_update(lmm_system_t sys,
- lmm_constraint_t cnst,
- xbt_maxmin_float_t * min_usage)
+ lmm_constraint_t cnst,
+ double *min_usage)
{
lmm_constraint_t useless_cnst = NULL;
- if(cnst->usage <=0) return;
- if (cnst->remaining <= 0) return;
+ if (cnst->usage <= 0)
+ return;
+ if (cnst->remaining <= 0)
+ return;
if ((*min_usage < 0) || (*min_usage > cnst->remaining / cnst->usage)) {
*min_usage = cnst->remaining / cnst->usage;
- while ((useless_cnst = xbt_swag_getFirst(&(sys->saturated_constraint_set))))
+ while ((useless_cnst =
+ xbt_swag_getFirst(&(sys->saturated_constraint_set))))
xbt_swag_remove(useless_cnst, &(sys->saturated_constraint_set));
xbt_swag_insert(cnst, &(sys->saturated_constraint_set));
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_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);
}
xbt_swag_t cnst_list = NULL;
xbt_swag_t var_list = NULL;
xbt_swag_t elem_list = NULL;
- xbt_maxmin_float_t min_usage = -1;
+ double min_usage = -1;
- if(!(sys->modified)) return;
+ if (!(sys->modified))
+ return;
/* Init */
var_list = &(sys->variable_set);
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);
}
/* Not a O(1) function */
void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
- lmm_variable_t var, xbt_maxmin_float_t value)
+ lmm_variable_t var, double value)
{
int i;
}
void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
- xbt_maxmin_float_t bound)
+ double bound)
{
sys->modified = 1;
var->bound = bound;
}
void lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var,
- xbt_maxmin_float_t weight)
+ 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;
}
void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
- xbt_maxmin_float_t bound)
+ double bound)
{
sys->modified = 1;
cnst->bound = bound;
int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst)
{
- return xbt_swag_belongs(cnst,&(sys->active_constraint_set));
+ 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);
}
