Ansi C declaration of the variables (at the beginning of the blocks)

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

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 20480d0..1798472 100644 (file)
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -33,7 +33,8 @@ 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 initial_bound;
+  double lambda;
+  double new_lambda;
   double remaining;
   int shared;
   double usage;
@@ -50,10 +51,17 @@ typedef struct lmm_variable {
   int cnsts_number;
   double weight;
   double bound;
-  double initial_bound;
   double value;
   void *id;
-  int index;
+  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 {
@@ -85,4 +93,8 @@ 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 */