Df parameter of Low models is replaced by weight because it means the same to maxmin...

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

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 27c44d2..0049b7f 100644 (file)
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -20,7 +20,7 @@ typedef struct lmm_element {
   lmm_constraint_t constraint;
   lmm_variable_t variable;
   double value;
-} s_lmm_element_t, *lmm_element_t;
+} 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))
 
@@ -51,16 +51,16 @@ typedef struct lmm_variable {
   int cnsts_number;
   double weight;
   double bound;
-  double mu;
-  double new_mu;
   double value;
-  double df; /* Total delay of flow */
   void *id;
-  int index;
-  double (* func_f)    (struct lmm_variable *var, double x);  /* f            */
-  double (* func_fp)   (struct lmm_variable *var, double x);  /* f'           */
+  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}    */
-  double (* func_fpip) (struct lmm_variable *var, double x);  /* ((f')^{-1})' */
+  /* \end{For Lagrange only} */
 } s_lmm_variable_t;
 
 typedef struct lmm_system {
@@ -92,4 +92,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 */