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

diff --git a/src/include/surf/maxmin.h b/src/include/surf/maxmin.h
index 4449f315a8..6618349385 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,
@@ -61,11 +67,18 @@ void lmm_update(lmm_system_t sys, lmm_constraint_t cnst,
 		lmm_variable_t var, double value);
 void lmm_update_variable_bound(lmm_system_t sys, lmm_variable_t var,
 			       double bound);
+
+
+XBT_PUBLIC(void) lmm_update_variable_latency(lmm_system_t sys, lmm_variable_t var,
+				 double delta);
+
+
+
 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);
@@ -74,7 +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 */
 
+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.
+ */
+
+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));
+
+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);
+
+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 */