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

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index d616c715e0..eb9ff1ec96 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -175,6 +175,12 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   var->bound = bound;
   var->value = 0.0;
   var->df    = 0.0;
+
+  var->func_f    = func_f_def;
+  var->func_fp   = func_fp_def;
+  var->func_fpi  = func_fpi_def;
+  var->func_fpip = func_fpip_def;
+
   if(weight) xbt_swag_insert_at_head(var,&(sys->variable_set));
   else xbt_swag_insert_at_tail(var,&(sys->variable_set));
   XBT_OUT;
@@ -327,6 +333,7 @@ static void saturated_variable_set_update(lmm_system_t sys)
 }
 
 void lmm_print(lmm_system_t sys)
+
 {
   lmm_constraint_t cnst = NULL;
   lmm_element_t elem = NULL;
@@ -380,7 +387,7 @@ void lmm_print(lmm_system_t sys)
     }
     DEBUG1("%s",trace_buf);
     trace_buf[0]='\000';
-    xbt_assert3((sum<=cnst->bound), "Incorrect value (%f is not smaller than %f): %g",
+    xbt_assert3(!double_positive(sum-cnst->bound), "Incorrect value (%f is not smaller than %f): %g",
 		sum,cnst->bound,sum-cnst->bound);
   }
 
@@ -388,7 +395,7 @@ void lmm_print(lmm_system_t sys)
   xbt_swag_foreach(var, var_list) {
     if(var->bound>0) {
       DEBUG4("'%p'(%f) : %f (<=%f)",var,var->weight,var->value, var->bound);
-      xbt_assert0((var->value<=var->bound), "Incorrect value");
+      xbt_assert0(!double_positive(var->value-var->bound), "Incorrect value");
     }
     else 
       DEBUG3("'%p'(%f) : %f",var,var->weight,var->value);
@@ -616,6 +623,8 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint
   return xbt_swag_getNext(cnst,(sys->active_constraint_set).offset);
 }
 
+
+
 /** \brief Attribute the value bound to var->bound.
  * 
  *  \param func_f    default function f associated with the chosen protocol flavor
@@ -623,7 +632,7 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint
  *  \param func_fpi  inverse of the partial differential of f (f prime inverse, (f')^{-1})
  *  \param func_fpip partial differential of the inverse of the partial differential of f (f prime inverse prime, ((f')^{-1})')
  * 
- *  Set default functions to the ones passed as parameters.
+ *  Set default functions to the ones passed as parameters. This is a polimorfism in C pure, enjoy the roots of programming.
  *
  */
 void lmm_set_default_protocol_functions(double (* func_f)    (lmm_variable_t var, double x),
@@ -638,80 +647,3 @@ void lmm_set_default_protocol_functions(double (* func_f)    (lmm_variable_t var
   func_fpip_def = func_fpip;
 }
 
-
-/*
- * NOTE for Reno: all functions consider the network
- * coeficient (alpha) equal to 1.
- */
-
-/*
- * For Reno f: $\alpha_f d_f \log\left(x_f\right)$
- */
-double func_reno_f(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  return var->df * log(x);
-}
-
-/*
- * For Reno fp: $\frac{\alpha D_f}{x}$
- */
-double func_reno_fp(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  return var->df/x;
-}
-
-/*
- * For Reno fpi: $\frac{\alpha D_f}{x}$
- */
-double func_reno_fpi(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  return var->df/x;
-}
-
-/*
- * For Reno fpip: $-\frac{\alpha D_f}{x^2}$
- */
-double func_reno_fpip(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  return -( var->df/(x*x) ) ;
-}
-
-
-/*
- * For Vegas f: $\frac{\sqrt{\frac{3}{2}}}{D_f} \arctan\left(\sqrt{\frac{3}{2}}x_f D_f\right)$
- */
-double func_vegas_f(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  // \sqrt{3/2} = 0.8164965808
-  return (0.8164965808 / var->df) * atan( (0.8164965808 / var->df)*x );
-}
-
-/*
- * For Vegas fp: $\frac{3{D_f}^2}{3{D_f}^2x^2 + 2}$
- */
-double func_vegas_fp(lmm_variable_t var, double x){
-  xbt_assert0(x,"Please report this bug.");
-  return (3*var->df*var->df) / (3*var->df*var->df*x*x + 2);
-}
-
-/*
- * For Vegas fpi: $\sqrt{\frac{1}{x} - \frac{2}{3{D_f}^2}}$
- */
-double func_vegas_fpi(lmm_variable_t var, double x){
-  double res_fpi; 
-  xbt_assert0( (x<0.0) ,"Please report this bug.");
-  xbt_assert0( (var->df<0.0), "Please report this bug.");
-  res_fpi = (1/x) - 2/(3*var->df*var->df);
-  return sqrt(res_fpi);
-}
-
-/*
- * For Vegas fpip:  $-\frac{1}{2x^2\sqrt{\frac{1}{x} - \frac{2}{3{D_f}^2}}}$
- */
-double func_vegas_fpip(lmm_variable_t var, double x){
-  double res_fpip; 
-  xbt_assert0(x,"Please report this bug.");
-  xbt_assert0( (x<0.0), "Please report this bug.");
-  res_fpip = sqrt(1/x - 2/(3*var->df*var->df));
-  return -(1/(2*x*x*res_fpip));
-}