s_xbt_swag_hookup_t modified_constraint_set_hookup;
s_xbt_swag_hookup_t saturated_constraint_set_hookup;
- 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 */
+ s_xbt_swag_t element_set; /* a list of lmm_element_t */
+ s_xbt_swag_t active_element_set; /* a list of lmm_element_t */
double bound;
double lambda;
double new_lambda;
double remaining;
- int shared;
double usage;
void *id;
int id_int;
+ int shared;
} s_lmm_constraint_t;
typedef struct lmm_variable {
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))
-#define extract_constraint(sys) xbt_swag_remove(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
+#define extract_variable(sys) xbt_swag_extract(&(sys->variable_set))
+#define extract_constraint(sys) xbt_swag_extract(&(sys->constraint_set))
#define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set))
#define remove_variable(sys,var) do {xbt_swag_remove(var,&(sys->variable_set));\
xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0)