These two certainly do not need hardcore portability bits

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

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 81a91cd..b38ed7b 100644 (file)
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -9,7 +9,6 @@
 #define _SURF_MAXMIN_H
 
 #include "xbt/misc.h"
-#include "portable.h" 
 
 #define MAXMIN_PRECISION 0.00001
 static XBT_INLINE void double_update(double *variable, double value) 
@@ -43,7 +42,6 @@ XBT_PUBLIC(lmm_variable_t) lmm_variable_new(lmm_system_t sys, void *id,
 void lmm_variable_free(lmm_system_t sys, lmm_variable_t var);
 XBT_PUBLIC(double) lmm_variable_getvalue(lmm_variable_t var);
 
-
 XBT_PUBLIC(void) lmm_expand(lmm_system_t sys, lmm_constraint_t cnst,
                lmm_variable_t var, double value);
 void lmm_expand_add(lmm_system_t sys, lmm_constraint_t cnst,
@@ -70,7 +68,7 @@ void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
                               double bound);
 
 
-void lmm_update_variable_latency(lmm_system_t sys, lmm_variable_t var,
+XBT_PUBLIC(void) lmm_update_variable_latency(lmm_system_t sys, lmm_variable_t var,
                                 double delta);
 
 
@@ -79,7 +77,7 @@ XBT_PUBLIC(void) lmm_update_variable_weight(lmm_system_t sys, lmm_variable_t var
                                double weight);
 double lmm_get_variable_weight(lmm_variable_t var);
 
-void lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
+XBT_PUBLIC(void) lmm_update_constraint_bound(lmm_system_t sys, lmm_constraint_t cnst,
                                 double bound);
 
 int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst);
@@ -88,27 +86,28 @@ int lmm_constraint_used(lmm_system_t sys, lmm_constraint_t cnst);
 XBT_PUBLIC(void) lmm_solve(lmm_system_t sys);
 
 #ifdef HAVE_SDP
-void sdp_solve(lmm_system_t sys);
+XBT_PUBLIC(void) sdp_solve(lmm_system_t sys);
 #endif /* HAVE_SDP */
 
-void lagrange_solve(lmm_system_t sys);
-
-void lagrange_dicotomi_solve(lmm_system_t sys);
-
-
+XBT_PUBLIC(void) lagrange_solve(lmm_system_t sys);
+XBT_PUBLIC(void) bottleneck_solve(lmm_system_t sys);
 
 /**
  * Default functions associated to the chosen protocol. When
  * using the lagrangian approach.
  */
-double (* func_fpi_def ) (lmm_variable_t , double);
-
 
-void lmm_set_default_protocol_function(double (* func_fpi)  (lmm_variable_t var, double x));
+XBT_PUBLIC(void) lmm_set_default_protocol_function(double (* func_f)  (lmm_variable_t var, double x),
+                                      double (* func_fp) (lmm_variable_t var, double x),
+                                      double (* func_fpi)(lmm_variable_t var, double x));
 
-double func_reno_fpi(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);
+XBT_PUBLIC(double func_reno_fpi)(lmm_variable_t var, double x);
 
-double func_vegas_fpi(lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_f)  (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_fp) (lmm_variable_t var, double x);
+XBT_PUBLIC(double func_vegas_fpi)(lmm_variable_t var, double x);
 
 
 #endif                         /* _SURF_MAXMIN_H */