SURF: Unify the types of models in a uniq s_surf_model_t (using an union) +reindent...

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

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 5e9e453..307519c 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))
 
@@ -30,8 +30,8 @@ typedef struct lmm_constraint {
   s_xbt_swag_hookup_t active_constraint_set_hookup;
   s_xbt_swag_hookup_t saturated_constraint_set_hookup;
 
-  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 */
+  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;
@@ -51,28 +51,27 @@ 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 *, double);  /* f            */
-  double (* func_fp)   (struct lmm_variable *, double);  /* f'           */
-  double (* func_fpi)  (struct lmm_variable *, double);  /* (f')^{-1}    */
-  double (* func_fpip) (struct lmm_variable *, double);  /* ((f')^{-1})' */
-  double func_fi;
+  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 {
   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 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 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_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;
@@ -93,4 +92,8 @@ static void lmm_cnst_free(lmm_system_t sys, lmm_constraint_t cnst);
 
 void lmm_print(lmm_system_t sys);
 
-#endif                         /* _SURF_MAXMIN_PRIVATE_H */
+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 */