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

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index eb9ff1ec96..ee52f232ac 100644
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -176,10 +176,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   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));
@@ -395,7 +392,8 @@ 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(!double_positive(var->value-var->bound), "Incorrect value");
+      xbt_assert2(!double_positive(var->value-var->bound), "Incorrect value (%f is not smaller than %f",
+		  var->value, var->bound);
     }
     else 
       DEBUG3("'%p'(%f) : %f",var,var->weight,var->value);
@@ -635,15 +633,8 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint
  *  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),
-					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))
-					
-{
-  func_f_def    = func_f;
-  func_fp_def   = func_fp;
+void lmm_set_default_protocol_functions(double (* func_fpi)  (lmm_variable_t var, double x))
+{
   func_fpi_def  = func_fpi;
-  func_fpip_def = func_fpip;
 }