Bug corrections: i) boundless variables wasn't detected properly,

ii) the sigma_i + mu_i wasn't done correctly, mu_i was added at
each lambda_j variable instead of only once at the end, iii) the
initialization of parameter df in lmm_variable_new was 1 and it must
be 0.0, iv) the function for Reno has some workrounds that doesn't
seem to work correctly (this last one to be continued...).
Thanks to Arnaud Legrand.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3769 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/lagrange.c b/src/surf/lagrange.c
index e656c70..30fb1fb 100644 (file)
--- a/src/surf/lagrange.c
+++ b/src/surf/lagrange.c
@@ -81,15 +81,16 @@ void lagrange_solve(lmm_system_t sys)
   var_list = &(sys->variable_set);
   i=0;
   xbt_swag_foreach(var, var_list) {    
-    if((var->bound > 0.0) || (var->weight <= 0.0)){
-      DEBUG1("#### NOTE var(%d) is a boundless variable", i);
+    if((var->bound < 0.0) || (var->weight <= 0.0)){
+      DEBUG1("#### NOTE var(%d) is a boundless (or inactive) variable", i);
       var->mu = -1.0;
     } else{ 
       var->mu =   1.0;
       var->new_mu = 2.0;
     }
-    DEBUG2("#### var(%d)->mu :  %e", i, var->mu);
-    DEBUG2("#### var(%d)->weight: %e", i, var->weight);
+    DEBUG3("#### var(%d) %p ->mu :  %e", i, var, var->mu);
+    DEBUG3("#### var(%d) %p ->weight: %e", i, var, var->weight);
+    DEBUG3("#### var(%d) %p ->bound: %e", i, var, var->bound);
     i++;
   }
 
@@ -119,8 +120,9 @@ void lagrange_solve(lmm_system_t sys)
       if((var->bound >= 0) && (var->weight > 0) ){
        var->new_mu = dicotomi(var->mu, partial_diff_mu, var, dicotomi_min_error);
        if(var->new_mu < 0) var->new_mu = 0;
+       DEBUG2("====> var->mu (%p) = %e", var, var->new_mu);      
        var->mu = var->new_mu;
-      }
+      } 
     }
 
     /*
@@ -146,9 +148,10 @@ void lagrange_solve(lmm_system_t sys)
        tmp = 0;
        for(i=0; i<var->cnsts_number; i++){
          tmp += (var->cnsts[i].constraint)->lambda;
-         if(var->bound > 0) 
-           tmp+=var->mu;
        }
+       if(var->bound > 0) 
+         tmp+=var->mu;
+       DEBUG3("\t Working on var (%p). cost = %e; Df = %e", var, tmp, var->df);
 
        //uses the partial differential inverse function
        tmp = var->func_fpi(var, tmp);
@@ -175,29 +178,36 @@ void lagrange_solve(lmm_system_t sys)
       tmp += var->value;
     }
   
-    tmp = tmp - cnst->bound;
-
-    if(tmp > epsilon_min_error){
-      WARN3("The link (%p) doesn't match the KKT property, expected less than %e and got %e", cnst, epsilon_min_error, tmp);
+    if(tmp - cnst->bound > epsilon_min_error) {
+      WARN3("The link (%p) is over-used. Expected less than %e and got %e", cnst, cnst->bound, tmp);
+    }
+    if(!((fabs(tmp - cnst->bound)<epsilon_min_error && cnst->lambda>=epsilon_min_error) ||
+        (fabs(tmp - cnst->bound)>=epsilon_min_error && cnst->lambda<epsilon_min_error))) {
+      WARN1("The KKT condition is not verified for cnst %p...", cnst);
+      overall_error=1.0;
     }
-  
   }
   
   //verify the KKT property of each flow
   xbt_swag_foreach(var, var_list){
-    if(var->bound <= 0 || var->weight <= 0) continue;
-    tmp = 0;
-    tmp = (var->value - var->bound);
+    if(var->bound < 0 || var->weight <= 0) continue;
 
-    
-    if(tmp != 0.0 ||  var->mu != 0.0){
-      WARN3("The flow (%p) doesn't match the KKT property, value expected (=0) got (lambda=%e) (sum_rho=%e)", var, var->mu, tmp);
+    INFO2("Checking KKT: sat = %e mu = %e",var->value - var->bound,var->mu);
+    if(!((fabs(var->value - var->bound)<epsilon_min_error && var->mu>=epsilon_min_error) ||
+        (fabs(var->value - var->bound)>=epsilon_min_error && var->mu<epsilon_min_error))) {
+      WARN1("The KKT condition is not verified for var %p...",var);
+      overall_error=1.0;
     }
 
+/*     tmp = 0; */
+/*     tmp = (var->value - var->bound); */
+/*     if(tmp != 0.0 ||  var->mu != 0.0){ */
+/*       WARN3("The flow (%p) doesn't match the KKT property, value expected (=0) got (lambda=%e) (sum_rho=%e)", var, var->mu, tmp); */
+/*     } */
   }
 
   if(overall_error <= epsilon_min_error){
-    DEBUG1("The method converge in %d iterations.", iteration);
+    DEBUG1("The method converges in %d iterations.", iteration);
   }else{
     WARN1("Method reach %d iterations, which is the maxmimun number of iterations allowed.", iteration);
   }
@@ -325,7 +335,7 @@ double partial_diff_lambda(double lambda, void *param_cnst){
   lmm_variable_t var = NULL;
   lmm_constraint_t cnst= (lmm_constraint_t) param_cnst;
   double lambda_partial=0.0;
-  double sigma_mu=0.0;
+  double sigma_i=0.0;
 
   elem_list = &(cnst->element_set);
 
@@ -336,21 +346,21 @@ double partial_diff_lambda(double lambda, void *param_cnst){
     if(var->weight<=0) continue;
     
     //initilize de sumation variable
-    sigma_mu = 0.0;
+    sigma_i = 0.0;
 
     //compute sigma_i of variable var
     for(i=0; i<var->cnsts_number; i++){
-      sigma_mu += (var->cnsts[i].constraint)->lambda;
+      sigma_i += (var->cnsts[i].constraint)->lambda;
     }
        
     //add mu_i if this flow has a RTT constraint associated
-    if(var->bound > 0) sigma_mu += var->mu;
+    if(var->bound > 0) sigma_i += var->mu;
 
     //replace value of cnst->lambda by the value of parameter lambda
-    sigma_mu = (sigma_mu - cnst->lambda) + lambda;
+    sigma_i = (sigma_i - cnst->lambda) + lambda;
     
     //use the auxiliar function passing (\sigma_i + \mu_i)
-    lambda_partial += diff_aux(var, sigma_mu);
+    lambda_partial += diff_aux(var, sigma_i);
   }
 
   lambda_partial += cnst->bound;

diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c
index e36c5c8..6f84c21 100644 (file)
--- a/src/surf/maxmin.c
+++ b/src/surf/maxmin.c
@@ -174,7 +174,7 @@ lmm_variable_t lmm_variable_new(lmm_system_t sys, void *id,
   var->weight = weight;
   var->bound = bound;
   var->value = 0.0;
-  var->df    = 1.0;
+  var->df    = 0.0;
 
   var->func_f    = func_f_def;
   var->func_fp   = func_fp_def;
@@ -710,8 +710,8 @@ 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
-  if(x == 0) x = 10e-8;
+  //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);
 
@@ -730,7 +730,7 @@ double func_reno_fpip(lmm_variable_t var, double x){
   xbt_assert0(var->df,"Please report this bug.");
 
   //avoid division by zero - c'est du bricolage mais ca marche
-  if(x == 0) x = 10e-8;
+  if(x == 0) x = 10e-16;
 
   res_fpip = 1/(var->df*var->df*x) - 2/(3*var->df*var->df);
   

diff --git a/src/surf/maxmin_private.h b/src/surf/maxmin_private.h
index 27c44d2..0a5e2b7 100644 (file)
--- a/src/surf/maxmin_private.h
+++ b/src/surf/maxmin_private.h
@@ -51,16 +51,18 @@ typedef struct lmm_variable {
   int cnsts_number;
   double weight;
   double bound;
+  double value;
+  void *id;
+  int index; /* FOR SDP ONLY */
+  /* \begin{For Lagrange only} */
   double mu;
   double new_mu;
-  double value;
   double df; /* Total delay of flow */
-  void *id;
-  int index;
   double (* func_f)    (struct lmm_variable *var, double x);  /* f            */
   double (* func_fp)   (struct lmm_variable *var, double x);  /* f'           */
   double (* func_fpi)  (struct lmm_variable *var, double x);  /* (f')^{-1}    */
   double (* func_fpip) (struct lmm_variable *var, double x);  /* ((f')^{-1})' */
+  /* \end{For Lagrange only} */
 } s_lmm_variable_t;
 
 typedef struct lmm_system {