X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92a1a3afd9e836da4c7cec7022097b7956c6d749..3d6fabd4dd7f7a84e8dc435558262c481d68d632:/src/include/surf/maxmin.h

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 81a1a3ef46..0e4db598c8 100644
--- a/src/include/surf/maxmin.h
+++ b/src/include/surf/maxmin.h
@@ -10,10 +10,17 @@
 
 #include "xbt/misc.h"
 #include "portable.h" 
+
+#define MAXMIN_PRECISION 0.00001
 static XBT_INLINE void double_update(double *variable, double value) 
 {
   *variable -= value;
-  if(*variable< 0.00001) *variable = 0.0;
+  if(*variable< MAXMIN_PRECISION) *variable = 0.0;
+}
+
+static XBT_INLINE int double_positive(double value) 
+{
+  return (value>MAXMIN_PRECISION);
 }
 
 typedef struct lmm_variable *lmm_variable_t;
@@ -36,7 +43,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,
@@ -63,7 +69,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);
 
 
@@ -72,7 +78,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);
@@ -81,40 +87,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_f_def   ) (lmm_variable_t , double);
-double (* func_fp_def  ) (lmm_variable_t , double);
-double (* func_fpi_def ) (lmm_variable_t , double);
-double (* func_fpip_def) (lmm_variable_t , double);
-
-
 
-void lmm_set_default_protocol_functions(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_fpip) (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_f(lmm_variable_t var, double x);
-double func_reno_fp(lmm_variable_t var, double x);
+double func_reno_f  (lmm_variable_t var, double x);
+double func_reno_fp (lmm_variable_t var, double x);
 double func_reno_fpi(lmm_variable_t var, double x);
-double func_reno_fpip(lmm_variable_t var, double x);
 
-double func_vegas_f(lmm_variable_t var, double x);
-double func_vegas_fp(lmm_variable_t var, double x);
+double func_vegas_f  (lmm_variable_t var, double x);
+double func_vegas_fp (lmm_variable_t var, double x);
 double func_vegas_fpi(lmm_variable_t var, double x);
-double func_vegas_fpip(lmm_variable_t var, double x);
 
 
 #endif				/* _SURF_MAXMIN_H */