Merge changes of maxmin_selective_update branch into the trunk.

[simgrid.git] / src / include / surf / maxmin.h

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 2336943..fe7f3c5 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -10,6 +10,7 @@
 
 #include "portable.h"
 #include "xbt/misc.h"
+#include "surf/datatypes.h"
 
 #define MAXMIN_PRECISION 0.00001
 static XBT_INLINE void double_update(double *variable, double value)
@@ -24,11 +25,6 @@ static XBT_INLINE int double_positive(double value)
   return (value > MAXMIN_PRECISION);
 }
 
-typedef struct lmm_element *lmm_element_t;
-typedef struct lmm_variable *lmm_variable_t;
-typedef struct lmm_constraint *lmm_constraint_t;
-typedef struct lmm_system *lmm_system_t;
-
 XBT_PUBLIC(lmm_system_t) lmm_system_new(void);
 XBT_PUBLIC(void) lmm_system_free(lmm_system_t sys);
      void lmm_variable_disable(lmm_system_t sys, lmm_variable_t var);
@@ -90,9 +86,7 @@ XBT_PUBLIC(void) lmm_update_constraint_bound(lmm_system_t sys,
 
 XBT_PUBLIC(void) lmm_solve(lmm_system_t sys);
 
-#ifdef HAVE_SDP
-XBT_PUBLIC(void) sdp_solve(lmm_system_t sys);
-#endif /* HAVE_SDP */
+XBT_PUBLIC(void *) lmm_extract_modified_variable(lmm_system_t sys);
 
 XBT_PUBLIC(void) lagrange_solve(lmm_system_t sys);
 XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
@@ -103,15 +97,11 @@ XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
  */
 
 XBT_PUBLIC(void) lmm_set_default_protocol_function(double (*func_f)
-                                                    
-                                                   (lmm_variable_t var,
-                                                    double x),
+                                                   (lmm_variable_t var, double x),
                                                    double (*func_fp)
-                                                   (lmm_variable_t var,
-                                                    double x),
+                                                   (lmm_variable_t var, double x),
                                                    double (*func_fpi)
-                                                   (lmm_variable_t var,
-                                                    double x));
+                                                   (lmm_variable_t var, double x));
 
 XBT_PUBLIC(double func_reno_f) (lmm_variable_t var, double x);
 XBT_PUBLIC(double func_reno_fp) (lmm_variable_t var, double x);