X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab3a9d12abbb2c3b42fa46f5869f234e78bc1180..bb671f9a46d6bba398acb63681457a3ad5b8c1dc:/src/surf/maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 03cf4ff5de..a2979244f0 100644
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -3,30 +3,77 @@
 /* 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 "../src/xbt/fifo_private.h" /* Yeah! I know. It is very dirty. */
+#include "xbt/swag.h"
 
-typedef struct lmm_mat_element {
-  s_xbt_fifo_item_t row;
-  FLOAT value;
-} s_mat_element_t;
+typedef struct lmm_element {
+  /* hookup to constraint */
+  s_xbt_swag_hookup_t element_set_hookup;
+  s_xbt_swag_hookup_t active_element_set_hookup;
 
-typedef struct lmm_cnst_element {
-  s_xbt_fifo_t row; /* in fact a list of lmm_mat_element_t */
-  void *id;
-  FLOAT bound;
-  FLOAT usage;
-} s_lmm_cnst_element_t;
+  lmm_constraint_t constraint;
+  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_remove(elem,&(elem->constraint->active_element_set))
+
+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 saturated_constraint_set_hookup;
 
-typedef struct lmm_var_element {
+  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 */
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t remaining;
+  xbt_maxmin_float_t usage;
   void *id;
-  s_mat_element_t *cnsts;
+} s_lmm_constraint_t;
+
+typedef struct lmm_variable {
+  /* hookup to system */
+  s_xbt_swag_hookup_t variable_set_hookup;
+  s_xbt_swag_hookup_t saturated_variable_set_hookup;
+
+  s_lmm_element_t *cnsts;
   int cnsts_size;
-  FLOAT value;
-  FLOAT bound;
-} s_lmm_var_element_t;
+  int cnsts_number;
+  xbt_maxmin_float_t weight;
+  xbt_maxmin_float_t bound;
+  xbt_maxmin_float_t value;
+  void *id;
+} s_lmm_variable_t;
 
 typedef struct lmm_system {
-  s_xbt_fifo_item_t var_set; /* in fact a list of lmm_var_element_t */
-  s_xbt_fifo_item_t cnst_set; /* in fact a list of lmm_cnst_element_t */
-};
+  int modified;
+  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 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_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 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) do {xbt_swag_remove(var,&(sys->variable_set));\
+                                 xbt_swag_remove(var,&(sys->saturated_variable_set));} while(0)
+#define remove_constraint(sys,cnst) do {xbt_swag_remove(cnst,&(sys->constraint_set));\
+                                        xbt_swag_remove(cnst,&(sys->saturated_constraint_set));} while(0)
+#define remove_active_constraint(sys,cnst) xbt_swag_remove(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_system_t sys, lmm_variable_t var);
+static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
+
+#endif				/* _SURF_MAXMIN_PRIVATE_H */