Don't use %t in log format, but %P; revalidate the output after listener introduction

[simgrid.git] / src / surf / maxmin.c

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index eb9ff1e..8419d5c 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -176,10 +176,9 @@ 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_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));
@@ -387,15 +386,18 @@ void lmm_print(lmm_system_t sys)
     }
     DEBUG1("%s",trace_buf);
     trace_buf[0]='\000';
-    xbt_assert3(!double_positive(sum-cnst->bound), "Incorrect value (%f is not smaller than %f): %g",
-               sum,cnst->bound,sum-cnst->bound);
+    if(double_positive(sum-cnst->bound))
+      WARN3("Incorrect value (%f is not smaller than %f): %g",
+              sum,cnst->bound,sum-cnst->bound);
   }
 
   /* Printing Result */
   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");
+      if(double_positive(var->value-var->bound))
+        WARN2("Incorrect value (%f is not smaller than %f",
+                 var->value, var->bound);
     }
     else 
       DEBUG3("'%p'(%f) : %f",var,var->weight,var->value);
@@ -624,26 +626,3 @@ lmm_constraint_t lmm_get_next_active_constraint(lmm_system_t sys, lmm_constraint
 }
 
 
-
-/** \brief Attribute the value bound to var->bound.
- * 
- *  \param func_f    default function f associated with the chosen protocol flavor
- *  \param func_fp   partial differential of f (f prime, f')
- *  \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. 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;
-  func_fpi_def  = func_fpi;
-  func_fpip_def = func_fpip;
-}
-