X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a765af45e3af8e4aeb5ac528b9f4e7ac6ce777f..509304ee1435b62cd49eb9071995fab468f68f58:/src/surf/maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 9f9002cee0..04047843f2 100644
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -3,33 +3,51 @@
 /* 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. */
 
+#ifndef _SURF_MAXMIN_PRIVATE_H
+#define _SURF_MAXMIN_PRIVATE_H
+
 #include "surf/maxmin.h"
 #include "xbt/swag.h"
 
 typedef struct lmm_element {
+  /* hookup to constraint */
   s_xbt_swag_hookup_t element_set_hookup;
+  s_xbt_swag_hookup_t active_element_set_hookup;
+
   lmm_constraint_t constraint;
-  FLOAT value;
+  lmm_variable_t variable;
+  xbt_maxmin_float_t value;
 } s_lmm_element_t, *lmm_element_t;
 #define insert_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->element_set))
+#define insert_active_elem_in_constraint(elem) xbt_swag_insert(elem,&(elem->constraint->active_element_set))
+#define remove_active_elem_in_constraint(elem) xbt_swag_extract(elem,&(elem->constraint->active_element_set))
 
 typedef struct lmm_constraint {
+  /* hookup to system */
   s_xbt_swag_hookup_t constraint_set_hookup;
-  /*   void *id; */
+  s_xbt_swag_hookup_t active_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 */
-  FLOAT bound;
-  FLOAT usage;
+  s_xbt_swag_t active_element_set;	/* a list of lmm_mat_element_t */
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t remaining;
+  xbt_maxmin_float_t usage;
+  char *id;
 } s_lmm_constraint_t;
 
 typedef struct lmm_variable {
+  /* hookup to system */
   s_xbt_swag_hookup_t variable_set_hookup;
-  /*   void *id; */
+  s_xbt_swag_hookup_t saturated_variable_set_hookup;
+
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
-  FLOAT weight_value;
-  FLOAT bound;
-  FLOAT value;
+  xbt_maxmin_float_t weight;
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t value;
+  char *id;
 } s_lmm_variable_t;
 
 typedef struct lmm_system {
@@ -37,17 +55,24 @@ typedef struct lmm_system {
   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 saturated_variable_set;	/* a list of lmm_variable_t */
+  s_xbt_swag_t saturated_constraint_set;	/* a list of lmm_constraint_t_t */
 } s_lmm_system_t;
 
 #define extract_variable(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->variable_set)),&(sys->variable_set))
 #define extract_constraint(sys) xbt_swag_extract(xbt_swag_getFirst(&(sys->constraint_set)),&(sys->constraint_set))
 #define insert_variable(sys,var) xbt_swag_insert(var,&(sys->variable_set))
 #define insert_constraint(sys,cnst) xbt_swag_insert(cnst,&(sys->constraint_set))
-#define remove_variable(sys,var) xbt_swag_extract(var,&(sys->variable_set))
-#define remove_constraint(sys,cnst) xbt_swag_extract(cnst,&(sys->constraint_set))
+#define remove_variable(sys,var) do {xbt_swag_extract(var,&(sys->variable_set));\
+                                 xbt_swag_extract(var,&(sys->saturated_variable_set));} while(0)
+#define remove_constraint(sys,cnst) do {xbt_swag_extract(cnst,&(sys->constraint_set));\
+                                        xbt_swag_extract(cnst,&(sys->saturated_constraint_set));} while(0)
+#define remove_active_constraint(sys,cnst) xbt_swag_extract(cnst,&(sys->active_constraint_set))
+#define make_constraint_active(sys,cnst) xbt_swag_insert(cnst,&(sys->active_constraint_set))
+#define make_constraint_inactive(sys,cnst) remove_active_constraint(sys,cnst)
 
-static void lmm_var_free(lmm_variable_t e);
-static void lmm_cnst_free(lmm_constraint_t 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);
 
-/* #define UNDEFINED_VALUE -1.0 */
-#define UNUSED_CONSTRAINT -2.0
+#endif				/* _SURF_MAXMIN_PRIVATE_H */