X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffe43ccd40d121bcde8fe95557df4388fc4dabd5..20caf382b20af687ee1ba042b68bb87df38e8fdf:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 28e1fb87ab..20480d057e 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -10,6 +10,7 @@ #include "surf/maxmin.h" #include "xbt/swag.h" +#include "xbt/mallocator.h" typedef struct lmm_element { /* hookup to constraint */ @@ -32,7 +33,9 @@ typedef struct lmm_constraint { s_xbt_swag_t element_set; /* a list of lmm_mat_element_t */ s_xbt_swag_t active_element_set; /* a list of lmm_mat_element_t */ double bound; + double initial_bound; double remaining; + int shared; double usage; void *id; } s_lmm_constraint_t; @@ -47,8 +50,10 @@ typedef struct lmm_variable { int cnsts_number; double weight; double bound; + double initial_bound; double value; void *id; + int index; } s_lmm_variable_t; typedef struct lmm_system { @@ -60,6 +65,8 @@ typedef struct lmm_system { s_xbt_swag_t saturated_variable_set; /* a list of lmm_variable_t */ s_xbt_swag_t saturated_constraint_set; /* a list of lmm_constraint_t_t */ + + xbt_mallocator_t variable_mallocator; } s_lmm_system_t; #define extract_variable(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set)) @@ -76,4 +83,6 @@ typedef struct lmm_system { static void lmm_var_free(lmm_system_t sys, lmm_variable_t var); static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst); +void lmm_print(lmm_system_t sys); + #endif /* _SURF_MAXMIN_PRIVATE_H */