X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..40b9540a553006e50628eb13c451c354a0671d3e:/src/surf/maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 26ca260087..0049b7f8ed 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 */
@@ -18,11 +19,10 @@ typedef struct lmm_element {
 
   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))
+  double value;
+} s_lmm_element_t;
+#define make_elem_active(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
+#define make_elem_inactive(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
 
 typedef struct lmm_constraint {
   /* hookup to system */
@@ -32,9 +32,12 @@ 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 */
-  xbt_maxmin_float_t bound;
-  xbt_maxmin_float_t remaining;
-  xbt_maxmin_float_t usage;
+  double bound;
+  double lambda;
+  double new_lambda;
+  double remaining;
+  int shared;
+  double usage;
   void *id;
 } s_lmm_constraint_t;
 
@@ -46,10 +49,18 @@ typedef struct lmm_variable {
   s_lmm_element_t *cnsts;
   int cnsts_size;
   int cnsts_number;
-  xbt_maxmin_float_t weight;
-  xbt_maxmin_float_t bound;
-  xbt_maxmin_float_t value;
+  double weight;
+  double bound;
+  double value;
   void *id;
+  int index; /* FOR SDP ONLY */
+  /* \begin{For Lagrange only} */
+  double mu;
+  double new_mu;
+  double (* func_f)  (struct lmm_variable *var, double x);  /* (f)    */
+  double (* func_fp)  (struct lmm_variable *var, double x);  /* (f')    */
+  double (* func_fpi)  (struct lmm_variable *var, double x);  /* (f')^{-1}    */
+  /* \end{For Lagrange only} */
 } s_lmm_variable_t;
 
 typedef struct lmm_system {
@@ -61,11 +72,12 @@ 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))
 #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)
@@ -78,4 +90,10 @@ 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);
+
+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 */