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

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index 98ce3a2134..eb9ff1ec96 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -647,100 +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 Vegas f: $\alpha_f d_f \log\left(x_f\right)$
- */
-double func_vegas_f(lmm_variable_t var, double x){
-  return var->df * log(x);
-}
-
-/*
- * For Vegas fp: $\frac{\alpha D_f}{x}$
- */
-double func_vegas_fp(lmm_variable_t var, double x){
-  //avoid a disaster value - c'est du bricolage mais ca marche
-/*   if(x == 0) x = 10e-8; */
-  return var->df/x;
-}
-
-/*
- * For Vegas fpi: $\frac{\alpha D_f}{x}$
- */
-double func_vegas_fpi(lmm_variable_t var, double x){
-  //avoid a disaster value - c'est du bricolage mais ca marche
-/*   if(x == 0) x = 10e-8; */
-  return var->df/x;
-}
-
-/*
- * For Vegas fpip: $-\frac{\alpha D_f}{x^2}$
- */
-double func_vegas_fpip(lmm_variable_t var, double x){
-  //avoid a disaster value - c'est du bricolage mais ca marche
-/*   if(x == 0) x = 10e-8; */
-  return -( var->df/(x*x) ) ;
-}
-
-
-/*
- * For Reno f: $\frac{\sqrt{\frac{3}{2}}}{D_f} \arctan\left(\sqrt{\frac{3}{2}}x_f D_f\right)$
- */
-double func_reno_f(lmm_variable_t var, double x){
-  xbt_assert0( var->df, "Please report this bug.");
-  // \sqrt{3/2} = 0.8164965808
-  return (0.8164965808 / var->df) * atan( (0.8164965808 / var->df)*x );
-}
-
-/*
- * For Reno fp: $\frac{3}{3 {D_f}^2 x^2 + 2}$
- */
-double func_reno_fp(lmm_variable_t var, double x){
-  return 3 / (3*var->df*var->df*x*x + 2);
-}
-
-/*
- * For Reno fpi: $\sqrt{\frac{1}{{D_f}^2 x} - \frac{2}{3{D_f}^2}}$
- */
-double func_reno_fpi(lmm_variable_t var, double x){
-  double res_fpi; 
-  xbt_assert0( var->df, "Please report this bug.");
-
-  //avoid a disaster value - c'est du bricolage mais ca marche pas ....
-/*   if(x == 0) x = 10e-16; */
- 
-  res_fpi = 1/(var->df*var->df*x) - 2/(3*var->df*var->df);
-
-  //avoid a disaster value of res_fpi
-  if(res_fpi < 0.0) return 0.0;
-  else return sqrt(res_fpi);
-}
-
-/*
- * For Reno fpip:  $-\frac{1}{2 {D_f}^2 x^2\sqrt{\frac{1}{{D_f}^2 x} - \frac{2}{3{D_f}^2}}}$
- */
-double func_reno_fpip(lmm_variable_t var, double x){
-  double res_fpip; 
-  double critical_test;
-
-  xbt_assert0(var->df,"Please report this bug.");
-
-  //avoid division by zero - c'est du bricolage mais ca marche
-/*   if(x == 0) x = 10e-16; */
-
-  res_fpip = 1/(var->df*var->df*x) - 2/(3*var->df*var->df);
-  
-  //avoid square root of negative number
-  if(res_fpip < 0.0) return 0.0;
-
-  //avoid division by zero
-  critical_test = (2*var->df*var->df*x*x*sqrt(res_fpip));
-
-/*   if(critical_test == 0.0) return 0.0; */
-/*   else */ return -(1/critical_test);
-}