func_f and func_fp need to be provided. This is weird. I thought I

[simgrid.git] / src / surf / maxmin_private.h

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 2b0ae5f..1798472 100644 (file)
--- 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 */
@@ -20,8 +21,8 @@ typedef struct lmm_element {
   lmm_variable_t variable;
   double value;
 } s_lmm_element_t, *lmm_element_t;
-#define insert_active_elem_in_constraint(elem) xbt_swag_insert_at_head(elem,&(elem->constraint->active_element_set))
-#define remove_active_elem_in_constraint(elem) xbt_swag_remove(elem,&(elem->constraint->active_element_set))
+#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,7 +33,10 @@ 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 */
   double bound;
+  double lambda;
+  double new_lambda;
   double remaining;
+  int shared;
   double usage;
   void *id;
 } s_lmm_constraint_t;
@@ -49,6 +53,15 @@ typedef struct lmm_variable {
   double bound;
   double value;
   void *id;
+  int index; /* FOR SDP ONLY */
+  /* \begin{For Lagrange only} */
+  double mu;
+  double new_mu;
+  double df; /* Total delay of flow */
+  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 {
@@ -60,6 +73,8 @@ 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))
@@ -76,4 +91,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 */