Java doesn't work on MAC for the moment...

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

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 2336943..bf6f577 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -8,8 +8,10 @@
 #ifndef _SURF_MAXMIN_H
 #define _SURF_MAXMIN_H
 
+#include <math.h>
 #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,10 +26,10 @@ 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;
+static XBT_INLINE int double_equals(double value1, double value2)
+{
+  return (fabs(value1 - value2) < MAXMIN_PRECISION);
+}
 
 XBT_PUBLIC(lmm_system_t) lmm_system_new(void);
 XBT_PUBLIC(void) lmm_system_free(lmm_system_t sys);
@@ -90,10 +92,6 @@ 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) lagrange_solve(lmm_system_t sys);
 XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
 
@@ -103,15 +101,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);