X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa8e71be179a7a12e74bcc550fa6fe2c54b8446a..f0e89ec6fd6ecb2a6171da22d3ccc88a24cf5ba1:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index db79c6faef..2239cd2b3e 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -23,10 +23,10 @@ typedef struct lmm_element { #define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set)) #define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set)) -//typedef struct lmm_constraint_light { -// double remaining_over_usage; -// lmm_constraint_t cnst; -//} s_lmm_constraint_light_t; +typedef struct lmm_constraint_light { + double remaining_over_usage; + lmm_constraint_t cnst; +} s_lmm_constraint_light_t; typedef struct lmm_constraint { /* hookup to system */ @@ -45,6 +45,7 @@ typedef struct lmm_constraint { int id_int; double lambda; double new_lambda; + lmm_constraint_light_t cnst_light; } s_lmm_constraint_t; typedef struct lmm_variable { @@ -100,10 +101,6 @@ typedef struct lmm_system { do { xbt_swag_remove(cnst, &sys->active_constraint_set); \ xbt_swag_remove(cnst, &sys->modified_constraint_set); } while (0) -static void lmm_var_free(lmm_system_t sys, lmm_variable_t var); -static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, - lmm_constraint_t cnst); - void lmm_print(lmm_system_t sys); extern double (*func_f_def) (lmm_variable_t, double);