X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..9438858cc5e254b4b2c2a19bcc9b1e93302831ba:/src/surf/maxmin_private.h diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h index 307519c29c..7b82d55a17 100644 --- a/src/surf/maxmin_private.h +++ b/src/surf/maxmin_private.h @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -28,6 +27,7 @@ typedef struct lmm_constraint { /* hookup to system */ s_xbt_swag_hookup_t constraint_set_hookup; s_xbt_swag_hookup_t active_constraint_set_hookup; + 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 */ @@ -39,6 +39,7 @@ typedef struct lmm_constraint { int shared; double usage; void *id; + int id_int; } s_lmm_constraint_t; typedef struct lmm_variable { @@ -53,7 +54,7 @@ typedef struct lmm_variable { double bound; double value; void *id; - int index; /* FOR SDP ONLY */ + int id_int; /* \begin{For Lagrange only} */ double mu; double new_mu; @@ -65,10 +66,13 @@ typedef struct lmm_variable { typedef struct lmm_system { int modified; + int selective_update_active; /* flag to update partially the system only selecting changed portions */ + s_xbt_swag_t variable_set; /* a list of lmm_variable_t */ s_xbt_swag_t constraint_set; /* a list of lmm_constraint_t */ s_xbt_swag_t active_constraint_set; /* a list of lmm_constraint_t */ + s_xbt_swag_t modified_constraint_set; /* a list of modified lmm_constraint_t */ 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 */ @@ -88,7 +92,8 @@ typedef struct lmm_system { #define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst) 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); +static XBT_INLINE void lmm_cnst_free(lmm_system_t sys, + lmm_constraint_t cnst); void lmm_print(lmm_system_t sys); @@ -96,4 +101,4 @@ extern double (*func_f_def) (lmm_variable_t, double); extern double (*func_fp_def) (lmm_variable_t, double); extern double (*func_fpi_def) (lmm_variable_t, double); -#endif /* _SURF_MAXMIN_PRIVATE_H */ +#endif /* _SURF_MAXMIN_PRIVATE_H */